From 0af40d1dcd4667f60f20216abe8c30fb5f1b1dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Wed, 5 Oct 2016 12:25:08 +0200
Subject: [PATCH 01/54] Fixes #3147 FAI tab should have a foreign key on FAI
 profile

Conflicts:
	fai/admin/systems/class_faiStartup.inc
---
 fai/admin/systems/class_faiStartup.inc | 58 ++++++++++++++++++--------
 fai/contrib/openldap/fai.schema        |  1 +
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/fai/admin/systems/class_faiStartup.inc b/fai/admin/systems/class_faiStartup.inc
index 94c97d2ab9..327b0f2c37 100644
--- a/fai/admin/systems/class_faiStartup.inc
+++ b/fai/admin/systems/class_faiStartup.inc
@@ -58,9 +58,24 @@ class faiStartup extends simplePlugin
 
   var $cache = array();
 
-  /*!
-   *  \brief The main function : information about attributes
-   */
+  static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('FAI'),
+      'plDescription'   => _('Full automated installation'),
+      'plSelfModify'    => FALSE,
+      'plPriority'      => 9,
+      'plObjectType'    => array('workstation', 'server', 'ogroup-dynamic'),
+      'plForeignKeys'  => array(
+        'FAIclass'   => array(
+          array('faiProfile', 'cn', '(FAIclass=%oldvalue% :*)'),
+        ),
+      ),
+
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
   static function getAttributesInfo ()
   {
     return array(
@@ -103,6 +118,29 @@ class faiStartup extends simplePlugin
     parent::__construct($dn, $object, $parent, $mainTab);
   }
 
+  function foreignKeyCheck ($field, $fieldvalue, $source)
+  {
+    if ($field == 'FAIclass') {
+      if ($this->attributesAccess['FAIclass']->attributes['profil']->getValue() == $fieldvalue) {
+        return TRUE;
+      }
+      return FALSE;
+    } else {
+      return parent::foreignKeyCheck ($field, $fieldvalue, $source);
+    }
+  }
+
+  function foreignKeyUpdate($field, $oldvalue, $newvalue, $source)
+  {
+    if ($field == 'FAIclass') {
+      if ($this->attributesAccess['FAIclass']->attributes['profil']->getValue() == $oldvalue) {
+        $this->attributesAccess['FAIclass']->attributes['profil']->setValue($newvalue);
+      }
+    } else {
+      return parent::foreignKeyUpdate($field, $oldvalue, $newvalue, $source);
+    }
+  }
+
   /* Updates release and profiles list
    *  if not already done ($this->cache).
    */
@@ -139,20 +177,6 @@ class faiStartup extends simplePlugin
       }
     }
   }
-
-  /* Return plugin informations for acl handling */
-  static function plInfo()
-  {
-    return array(
-      'plShortName'     => _('FAI'),
-      'plDescription'   => _('Full automated installation'),
-      'plSelfModify'    => FALSE,
-      'plPriority'      => 9,
-      'plObjectType'    => array('workstation', 'server', 'ogroup-dynamic'),
-
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
-    );
-  }
 }
 
 ?>
diff --git a/fai/contrib/openldap/fai.schema b/fai/contrib/openldap/fai.schema
index 312eb196d9..c7ac7dc0c0 100644
--- a/fai/contrib/openldap/fai.schema
+++ b/fai/contrib/openldap/fai.schema
@@ -69,6 +69,7 @@
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.1 NAME 'FAIclass'
     DESC 'Storage for FAI class names'
     EQUALITY caseExactMatch
+    SUBSTR caseExactSubstringsMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{64})
 
 # Name       : FAIpriority
-- 
GitLab


From cff5bc5533f5ac55f0973c44963295c4ac593f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Tue, 11 Oct 2016 12:56:43 +0200
Subject: [PATCH 02/54] Fixed debugHelp to work on last 1.1

---
 developers/debug-help/addons/debug-help/class_debugHelp.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/developers/debug-help/addons/debug-help/class_debugHelp.inc b/developers/debug-help/addons/debug-help/class_debugHelp.inc
index 05894a5c8c..198f08f49a 100644
--- a/developers/debug-help/addons/debug-help/class_debugHelp.inc
+++ b/developers/debug-help/addons/debug-help/class_debugHelp.inc
@@ -28,7 +28,10 @@ class debugHelp extends simplePlugin
       'plSection'     => 'reporting',
       'plPriority'    => 1,
       'plIcon'        => 'geticon.php?context=categories&icon=applications-development&size=48',
-      'plCategory'    => array('debug' => array('objectClass' => 'none', 'description' => _('Diagram'))),
+      'plObjectType'  => array('debug' => array(
+        'name'      => _('Debug help'),
+        'mainAttr'  => FALSE
+      )),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );
-- 
GitLab


From f8fe8b10ffc2b3e47e0ebd189ea48448ae8c3b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Mon, 19 Sep 2016 10:30:04 +0200
Subject: [PATCH 03/54] Changed some doxygen options to have clearer diagrams

---
 developers/Doxyfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/developers/Doxyfile b/developers/Doxyfile
index 0f4a795c29..83a4eabffc 100644
--- a/developers/Doxyfile
+++ b/developers/Doxyfile
@@ -415,7 +415,7 @@ HIDE_UNDOC_MEMBERS     = YES
 # If set to NO (the default) these classes will be included in the various
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
-HIDE_UNDOC_CLASSES     = YES
+HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
 # friend (class|struct|union) declarations.
@@ -1651,7 +1651,7 @@ MSCGEN_PATH            =
 # inheritance and usage relations if the target is undocumented
 # or is not a class.
 
-HIDE_UNDOC_RELATIONS   = YES
+HIDE_UNDOC_RELATIONS   = NO
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz, a graph visualization
@@ -1700,7 +1700,7 @@ CLASS_GRAPH            = YES
 # indirect implementation dependencies (inheritance, containment, and
 # class references variables) of the class with other documented classes.
 
-COLLABORATION_GRAPH    = YES
+COLLABORATION_GRAPH    = NO
 
 # If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for groups, showing the direct groups dependencies
-- 
GitLab


From ebd4a4a815271d447704c9d32005169cbfcf0270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Wed, 12 Oct 2016 10:00:14 +0200
Subject: [PATCH 04/54] Moving the init of FAI fields to a bit later in
 simplePlugin workflow

This avoids some useless LDAP search at login
---
 .../systems/services/repository/class_serviceRepository.inc  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fai/admin/systems/services/repository/class_serviceRepository.inc b/fai/admin/systems/services/repository/class_serviceRepository.inc
index abdcedfde9..5ec301781f 100644
--- a/fai/admin/systems/services/repository/class_serviceRepository.inc
+++ b/fai/admin/systems/services/repository/class_serviceRepository.inc
@@ -83,7 +83,12 @@ class FAIRepositoryAttribute extends PipeSeparatedCompositeAttribute
       $label
     );
     $this->attributes[7]->setSubmitForm(TRUE);
+  }
+
+  function setParent(&$plugin)
+  {
     $this->updateFields();
+    parent::setParent($plugin);
   }
 
   function updateFields()
-- 
GitLab


From c88cabe2ca25311d596868826a19b15b1c4e7ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Wed, 12 Oct 2016 14:44:29 +0200
Subject: [PATCH 05/54] Adadapted *-list.xml to new objectType/departmentType
 filters

---
 fai/admin/fai/packageSelect/selectPackage-list.xml  | 4 ++--
 fusioninventory/admin/inventory/inventory-list.xml  | 4 ++--
 gpg/personal/gpg/pgpKeySelect/pgpKeySelect-list.xml | 4 ++--
 systems/admin/systems/system-list.xml               | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fai/admin/fai/packageSelect/selectPackage-list.xml b/fai/admin/fai/packageSelect/selectPackage-list.xml
index 7299ba9f13..b054dbd0ea 100644
--- a/fai/admin/fai/packageSelect/selectPackage-list.xml
+++ b/fai/admin/fai/packageSelect/selectPackage-list.xml
@@ -24,7 +24,7 @@
     <layout>|20px;c||180|</layout>
 
     <department>
-      <value>%{filter:objectType(dn,objectClass)}</value>
+      <value>%{filter:departmentType(row,dn)}</value>
     </department>
 
     <department>
@@ -33,7 +33,7 @@
     </department>
 
     <column>
-      <value>%{filter:objectType(dn,objectClass)}</value>
+      <value>%{filter:objectType(row,dn)}</value>
     </column>
 
     <column>
diff --git a/fusioninventory/admin/inventory/inventory-list.xml b/fusioninventory/admin/inventory/inventory-list.xml
index f6c996bc57..e93c7e0a1c 100644
--- a/fusioninventory/admin/inventory/inventory-list.xml
+++ b/fusioninventory/admin/inventory/inventory-list.xml
@@ -12,7 +12,7 @@
     <layout>|20px;c||150px-d||185px-d;r|</layout>
 
     <department>
-      <value>%{filter:objectType(dn,objectClass)}</value>
+      <value>%{filter:departmentType(row,dn)}</value>
     </department>
 
     <department>
@@ -21,7 +21,7 @@
     </department>
 
     <column>
-      <value>%{filter:objectType(dn,objectClass)}</value>
+      <value>%{filter:objectType(row,dn)}</value>
     </column>
 
     <column>
diff --git a/gpg/personal/gpg/pgpKeySelect/pgpKeySelect-list.xml b/gpg/personal/gpg/pgpKeySelect/pgpKeySelect-list.xml
index b89118e1bd..645345453d 100644
--- a/gpg/personal/gpg/pgpKeySelect/pgpKeySelect-list.xml
+++ b/gpg/personal/gpg/pgpKeySelect/pgpKeySelect-list.xml
@@ -24,7 +24,7 @@
     <layout>|20px;c|||||||||</layout>
 
     <department>
-      <value>%{filter:objectType(dn,objectClass)}</value>
+      <value>%{filter:departmentType(row,dn)}</value>
     </department>
 
     <department>
@@ -33,7 +33,7 @@
     </department>
 
     <column>
-      <value>%{filter:objectType(dn,objectClass)}</value>
+      <value>%{filter:objectType(row,dn)}</value>
     </column>
 
     <column>
diff --git a/systems/admin/systems/system-list.xml b/systems/admin/systems/system-list.xml
index 13e10c4bb8..66e3dcff35 100644
--- a/systems/admin/systems/system-list.xml
+++ b/systems/admin/systems/system-list.xml
@@ -104,7 +104,7 @@
     <layout>|20px;c||90px-d|110px|100px;o||60px;o|170px-d;r|</layout>
 
     <department>
-      <value>%{filter:objectType(dn,objectClass)}</value>
+      <value>%{filter:departmentType(row,dn)}</value>
     </department>
 
     <department>
@@ -113,7 +113,7 @@
     </department>
 
     <column>
-      <value>%{filter:objectType(dn,objectClass)}</value>
+      <value>%{filter:objectType(row,dn)}</value>
     </column>
 
     <column>
-- 
GitLab


From 993357cbacb3776e8f891d2ec463621846be5288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Wed, 12 Oct 2016 18:44:50 +0200
Subject: [PATCH 06/54] Adadpted to last core commit removing filterRowLink

---
 fusioninventory/admin/inventory/inventory-list.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fusioninventory/admin/inventory/inventory-list.xml b/fusioninventory/admin/inventory/inventory-list.xml
index e93c7e0a1c..a2d19c9c71 100644
--- a/fusioninventory/admin/inventory/inventory-list.xml
+++ b/fusioninventory/admin/inventory/inventory-list.xml
@@ -28,7 +28,7 @@
       <label>IP</label>
       <sortAttribute>cn</sortAttribute>
       <sortType>string</sortType>
-      <value>%{filter:filterRowLink(pid,row,dn,cn)}</value>
+      <value>%{filter:link(row,dn,"%s",cn)}</value>
       <export>true</export>
     </column>
 
@@ -36,7 +36,7 @@
       <label>Macs</label>
       <sortAttribute>macAddress</sortAttribute>
       <sortType>string</sortType>
-      <value>%{filter:filterRowLink(pid,row,dn,macAddress)}</value>
+      <value>%{filter:link(row,dn,"%s",macAddress)}</value>
       <export>true</export>
     </column>
 
-- 
GitLab


From b68524696c6ceda0f6f1df5b898db5aa631e4dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Thu, 13 Oct 2016 14:01:46 +0200
Subject: [PATCH 07/54] Avoid useless calls to getDN

Conflicts:
	dhcp/admin/dhcp/class_dhcpConfiguration.inc
---
 samba/personal/samba/class_sambaAccount.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samba/personal/samba/class_sambaAccount.inc b/samba/personal/samba/class_sambaAccount.inc
index eca5971739..298d90906d 100644
--- a/samba/personal/samba/class_sambaAccount.inc
+++ b/samba/personal/samba/class_sambaAccount.inc
@@ -533,11 +533,11 @@ class sambaAccount extends simplePlugin
           WARNING_DIALOG
         );
       } else {
-        $ldap->fetch();
+        $attrs = $ldap->fetch();
         try {
-          $tabGroup = objects::open($ldap->getDN(), 'group');
+          $tabGroup = objects::open($attrs['dn'], 'group');
         } catch (NonExistingObjectTypeException $e) {
-          $tabGroup = objects::open($ldap->getDN(), 'ogroup');
+          $tabGroup = objects::open($attrs['dn'], 'ogroup');
         }
         if ($tabGroup->by_object['sambaGroup']->is_account) {
           if ($tabGroup->by_object['sambaGroup']->sambaSID == "") {
-- 
GitLab


From 9939ecb58b78f25738354b3c02c2399d16f0ad3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Thu, 13 Oct 2016 15:00:02 +0200
Subject: [PATCH 08/54] Fixes #5192 ldapmanager method has the wrong name

---
 ldapmanager/addons/ldapmanager/class_ldapmanager.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ldapmanager/addons/ldapmanager/class_ldapmanager.inc b/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
index 79557f6f42..359ccacc46 100644
--- a/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
+++ b/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
@@ -188,7 +188,7 @@ class ldapmanager extends simplePlugin
     }
   }
 
-  function handle_import_submit()
+  function handle_import_ldif_submit()
   {
     global $config;
     $ldap = $config->get_ldap_link();
-- 
GitLab


From 2c9512bd7c5e128724e6fc3b3cd4638b3b9ab648 Mon Sep 17 00:00:00 2001
From: Mortier Benoit <benoit.mortier@opensides.be>
Date: Sat, 15 Oct 2016 17:04:52 +0200
Subject: [PATCH 09/54] Update locale for 1.0.17

Signed-off-by: Mortier Benoit <benoit.mortier@opensides.be>
---
 alias/locale/en/fusiondirectory.po           |  2 +-
 applications/locale/en/fusiondirectory.po    |  2 +-
 argonaut/locale/en/fusiondirectory.po        |  2 +-
 audit/locale/en/fusiondirectory.po           |  2 +-
 autofs/locale/en/fusiondirectory.po          |  2 +-
 certificates/locale/en/fusiondirectory.po    |  2 +-
 community/locale/en/fusiondirectory.po       |  2 +-
 cyrus/locale/en/fusiondirectory.po           |  2 +-
 debconf/locale/en/fusiondirectory.po         |  2 +-
 developers/locale/en/fusiondirectory.po      | 15 ++---
 dhcp/locale/en/fusiondirectory.po            |  2 +-
 dns/locale/en/fusiondirectory.po             |  2 +-
 dovecot/locale/en/fusiondirectory.po         |  2 +-
 dsa/locale/en/fusiondirectory.po             |  2 +-
 ejbca/locale/en/fusiondirectory.po           |  2 +-
 fai/locale/en/fusiondirectory.po             | 42 ++++++-------
 freeradius/locale/en/fusiondirectory.po      |  2 +-
 fusioninventory/locale/en/fusiondirectory.po |  2 +-
 gpg/locale/en/fusiondirectory.po             |  2 +-
 ipmi/locale/en/fusiondirectory.po            |  2 +-
 kolab2/locale/en/fusiondirectory.po          |  2 +-
 ldapdump/locale/en/fusiondirectory.po        |  2 +-
 ldapmanager/locale/en/fusiondirectory.po     | 64 ++++++++++----------
 mail/locale/en/fusiondirectory.po            |  2 +-
 mixedgroups/locale/en/fusiondirectory.po     |  2 +-
 nagios/locale/en/fusiondirectory.po          |  2 +-
 netgroups/locale/en/fusiondirectory.po       |  2 +-
 newsletter/locale/en/fusiondirectory.po      |  2 +-
 opsi/locale/en/fusiondirectory.po            |  2 +-
 personal/locale/en/fusiondirectory.po        |  2 +-
 postfix/locale/en/fusiondirectory.po         |  2 +-
 ppolicy/locale/en/fusiondirectory.po         |  2 +-
 puppet/locale/en/fusiondirectory.po          |  2 +-
 pureftpd/locale/en/fusiondirectory.po        |  2 +-
 quota/locale/en/fusiondirectory.po           |  2 +-
 repository/locale/en/fusiondirectory.po      |  2 +-
 samba/locale/en/fusiondirectory.po           |  2 +-
 sogo/locale/en/fusiondirectory.po            |  2 +-
 spamassassin/locale/en/fusiondirectory.po    |  2 +-
 squid/locale/en/fusiondirectory.po           |  2 +-
 ssh/locale/en/fusiondirectory.po             |  2 +-
 subcontracting/locale/en/fusiondirectory.po  |  2 +-
 sudo/locale/en/fusiondirectory.po            | 40 ++++++------
 supann/locale/en/fusiondirectory.po          |  2 +-
 sympa/locale/en/fusiondirectory.po           |  2 +-
 systems/locale/en/fusiondirectory.po         |  2 +-
 user-reminder/locale/en/fusiondirectory.po   |  2 +-
 weblink/locale/en/fusiondirectory.po         |  2 +-
 webservice/locale/en/fusiondirectory.po      | 10 +--
 49 files changed, 128 insertions(+), 131 deletions(-)

diff --git a/alias/locale/en/fusiondirectory.po b/alias/locale/en/fusiondirectory.po
index c9bd2c9cdc..f111e7c34f 100644
--- a/alias/locale/en/fusiondirectory.po
+++ b/alias/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/applications/locale/en/fusiondirectory.po b/applications/locale/en/fusiondirectory.po
index 2414f6b8fa..8b193b3bb0 100644
--- a/applications/locale/en/fusiondirectory.po
+++ b/applications/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/argonaut/locale/en/fusiondirectory.po b/argonaut/locale/en/fusiondirectory.po
index 8272adbeee..c739aadf22 100644
--- a/argonaut/locale/en/fusiondirectory.po
+++ b/argonaut/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/audit/locale/en/fusiondirectory.po b/audit/locale/en/fusiondirectory.po
index 43ba0b08b9..a1d203afef 100644
--- a/audit/locale/en/fusiondirectory.po
+++ b/audit/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/autofs/locale/en/fusiondirectory.po b/autofs/locale/en/fusiondirectory.po
index 40500f8564..f28494246e 100644
--- a/autofs/locale/en/fusiondirectory.po
+++ b/autofs/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/certificates/locale/en/fusiondirectory.po b/certificates/locale/en/fusiondirectory.po
index 5073df8ff6..1f397f9936 100644
--- a/certificates/locale/en/fusiondirectory.po
+++ b/certificates/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/community/locale/en/fusiondirectory.po b/community/locale/en/fusiondirectory.po
index 9815e64959..c9a1fd36cf 100644
--- a/community/locale/en/fusiondirectory.po
+++ b/community/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/cyrus/locale/en/fusiondirectory.po b/cyrus/locale/en/fusiondirectory.po
index e891127777..324b7c640e 100644
--- a/cyrus/locale/en/fusiondirectory.po
+++ b/cyrus/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/debconf/locale/en/fusiondirectory.po b/debconf/locale/en/fusiondirectory.po
index 75a1b84c75..f6f840fbd5 100644
--- a/debconf/locale/en/fusiondirectory.po
+++ b/debconf/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/developers/locale/en/fusiondirectory.po b/developers/locale/en/fusiondirectory.po
index fe6ec10170..9cca47cbe3 100644
--- a/developers/locale/en/fusiondirectory.po
+++ b/developers/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -18,6 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Debug help"
 msgstr ""
 
@@ -25,23 +26,19 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
 msgid "Object Types"
 msgstr ""
 
diff --git a/dhcp/locale/en/fusiondirectory.po b/dhcp/locale/en/fusiondirectory.po
index 51726c4794..3f0d59019c 100644
--- a/dhcp/locale/en/fusiondirectory.po
+++ b/dhcp/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/dns/locale/en/fusiondirectory.po b/dns/locale/en/fusiondirectory.po
index a2da0c347f..6ccd95b07f 100644
--- a/dns/locale/en/fusiondirectory.po
+++ b/dns/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/dovecot/locale/en/fusiondirectory.po b/dovecot/locale/en/fusiondirectory.po
index 3a8d92d8ba..fadd11a5f3 100644
--- a/dovecot/locale/en/fusiondirectory.po
+++ b/dovecot/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/dsa/locale/en/fusiondirectory.po b/dsa/locale/en/fusiondirectory.po
index 6acdafa455..a288751254 100644
--- a/dsa/locale/en/fusiondirectory.po
+++ b/dsa/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ejbca/locale/en/fusiondirectory.po b/ejbca/locale/en/fusiondirectory.po
index 633ba0fbae..7c06b48b74 100644
--- a/ejbca/locale/en/fusiondirectory.po
+++ b/ejbca/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/fai/locale/en/fusiondirectory.po b/fai/locale/en/fusiondirectory.po
index 7ae6fb1ac6..1c75fbba42 100644
--- a/fai/locale/en/fusiondirectory.po
+++ b/fai/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
+#: admin/systems/class_faiStartup.inc:64 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
@@ -51,9 +51,9 @@ msgstr ""
 #: admin/fai/class_faiPartitionTable.inc:209
 #: admin/fai/class_faiPartitionTable.inc:250
 #: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
 msgid "LDAP error"
 msgstr ""
 
@@ -118,11 +118,11 @@ msgstr ""
 msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
+#: 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:76
+#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
 msgid "Release"
 msgstr ""
@@ -782,34 +782,34 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:68
+#: 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:72
+#: admin/systems/class_faiStartup.inc:87
 msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:76
+#: admin/systems/class_faiStartup.inc:91
 msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
+#: admin/systems/class_faiStartup.inc:95
 msgid "Profil"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
+#: admin/systems/class_faiStartup.inc:95
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:88
+#: admin/systems/class_faiStartup.inc:103
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
-msgstr ""
-
 #: admin/systems/services/repository/class_serviceRepository.inc:31
 msgid "URL"
 msgstr ""
@@ -874,19 +874,19 @@ msgstr ""
 msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
+#: admin/systems/services/repository/class_serviceRepository.inc:160
 msgid "Package repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
+#: admin/systems/services/repository/class_serviceRepository.inc:161
 msgid "Package repository information"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
+#: admin/systems/services/repository/class_serviceRepository.inc:173
 msgid "Repositories"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
+#: admin/systems/services/repository/class_serviceRepository.inc:178
 msgid "Repositories this server hosts"
 msgstr ""
 
diff --git a/freeradius/locale/en/fusiondirectory.po b/freeradius/locale/en/fusiondirectory.po
index 9a05abc6c7..70ea572e44 100644
--- a/freeradius/locale/en/fusiondirectory.po
+++ b/freeradius/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/fusioninventory/locale/en/fusiondirectory.po b/fusioninventory/locale/en/fusiondirectory.po
index 0b3d1b0993..787c163bbb 100644
--- a/fusioninventory/locale/en/fusiondirectory.po
+++ b/fusioninventory/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/gpg/locale/en/fusiondirectory.po b/gpg/locale/en/fusiondirectory.po
index 323179047b..86302e29ce 100644
--- a/gpg/locale/en/fusiondirectory.po
+++ b/gpg/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ipmi/locale/en/fusiondirectory.po b/ipmi/locale/en/fusiondirectory.po
index d55296eb3b..5eff9442e9 100644
--- a/ipmi/locale/en/fusiondirectory.po
+++ b/ipmi/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/kolab2/locale/en/fusiondirectory.po b/kolab2/locale/en/fusiondirectory.po
index 9439f87e00..b83b683af4 100644
--- a/kolab2/locale/en/fusiondirectory.po
+++ b/kolab2/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ldapdump/locale/en/fusiondirectory.po b/ldapdump/locale/en/fusiondirectory.po
index 4797e196b8..adbe0b5d7e 100644
--- a/ldapdump/locale/en/fusiondirectory.po
+++ b/ldapdump/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ldapmanager/locale/en/fusiondirectory.po b/ldapmanager/locale/en/fusiondirectory.po
index cfc8c9c7e9..b7be5274ef 100644
--- a/ldapmanager/locale/en/fusiondirectory.po
+++ b/ldapmanager/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -31,7 +31,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr ""
 
@@ -51,72 +51,72 @@ msgstr ""
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -153,57 +153,57 @@ msgstr ""
 msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
+#: addons/ldapmanager/class_csvimport.inc:52
 msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
+#: addons/ldapmanager/class_csvimport.inc:52
 msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
+#: addons/ldapmanager/class_csvimport.inc:58
 msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
+#: addons/ldapmanager/class_csvimport.inc:58
 msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
+#: addons/ldapmanager/class_csvimport.inc:62
 msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
+#: addons/ldapmanager/class_csvimport.inc:62
 msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:76
+#: addons/ldapmanager/class_csvimport.inc:85
 msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
+#: addons/ldapmanager/class_csvimport.inc:94
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_csvimport.inc:258
 msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
 msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/mail/locale/en/fusiondirectory.po b/mail/locale/en/fusiondirectory.po
index f1ee98e13e..1d2eebb136 100644
--- a/mail/locale/en/fusiondirectory.po
+++ b/mail/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/mixedgroups/locale/en/fusiondirectory.po b/mixedgroups/locale/en/fusiondirectory.po
index f0df51a961..b32a89aaee 100644
--- a/mixedgroups/locale/en/fusiondirectory.po
+++ b/mixedgroups/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/nagios/locale/en/fusiondirectory.po b/nagios/locale/en/fusiondirectory.po
index ce63f02005..75e9ac671f 100644
--- a/nagios/locale/en/fusiondirectory.po
+++ b/nagios/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/netgroups/locale/en/fusiondirectory.po b/netgroups/locale/en/fusiondirectory.po
index 7db5d0145f..2a8620deac 100644
--- a/netgroups/locale/en/fusiondirectory.po
+++ b/netgroups/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/newsletter/locale/en/fusiondirectory.po b/newsletter/locale/en/fusiondirectory.po
index c9c7269d0f..4d0104a0cb 100644
--- a/newsletter/locale/en/fusiondirectory.po
+++ b/newsletter/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/opsi/locale/en/fusiondirectory.po b/opsi/locale/en/fusiondirectory.po
index 456e8d1c58..f86c8f36c4 100644
--- a/opsi/locale/en/fusiondirectory.po
+++ b/opsi/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/personal/locale/en/fusiondirectory.po b/personal/locale/en/fusiondirectory.po
index a11916ec8f..d36273d20c 100644
--- a/personal/locale/en/fusiondirectory.po
+++ b/personal/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/postfix/locale/en/fusiondirectory.po b/postfix/locale/en/fusiondirectory.po
index 6b794401f9..3955166233 100644
--- a/postfix/locale/en/fusiondirectory.po
+++ b/postfix/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ppolicy/locale/en/fusiondirectory.po b/ppolicy/locale/en/fusiondirectory.po
index deab9aa489..dfb1be2111 100644
--- a/ppolicy/locale/en/fusiondirectory.po
+++ b/ppolicy/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/puppet/locale/en/fusiondirectory.po b/puppet/locale/en/fusiondirectory.po
index 4226476f3e..d79b35c254 100644
--- a/puppet/locale/en/fusiondirectory.po
+++ b/puppet/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/pureftpd/locale/en/fusiondirectory.po b/pureftpd/locale/en/fusiondirectory.po
index ef1269f8f5..9f8bfc28b3 100644
--- a/pureftpd/locale/en/fusiondirectory.po
+++ b/pureftpd/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/quota/locale/en/fusiondirectory.po b/quota/locale/en/fusiondirectory.po
index 659d43cd5f..fd2277db34 100644
--- a/quota/locale/en/fusiondirectory.po
+++ b/quota/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/repository/locale/en/fusiondirectory.po b/repository/locale/en/fusiondirectory.po
index f97dad19a5..1602ed835f 100644
--- a/repository/locale/en/fusiondirectory.po
+++ b/repository/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/samba/locale/en/fusiondirectory.po b/samba/locale/en/fusiondirectory.po
index 9e47f584d5..28978fe881 100644
--- a/samba/locale/en/fusiondirectory.po
+++ b/samba/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/sogo/locale/en/fusiondirectory.po b/sogo/locale/en/fusiondirectory.po
index 1c185f02ff..5455951dbb 100644
--- a/sogo/locale/en/fusiondirectory.po
+++ b/sogo/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/spamassassin/locale/en/fusiondirectory.po b/spamassassin/locale/en/fusiondirectory.po
index 553c7860f3..59402ffa01 100644
--- a/spamassassin/locale/en/fusiondirectory.po
+++ b/spamassassin/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/squid/locale/en/fusiondirectory.po b/squid/locale/en/fusiondirectory.po
index c34fdc9fab..0b34ca668c 100644
--- a/squid/locale/en/fusiondirectory.po
+++ b/squid/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ssh/locale/en/fusiondirectory.po b/ssh/locale/en/fusiondirectory.po
index edf945395b..aeee6273b3 100644
--- a/ssh/locale/en/fusiondirectory.po
+++ b/ssh/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/subcontracting/locale/en/fusiondirectory.po b/subcontracting/locale/en/fusiondirectory.po
index 3b7cae7822..6a32834148 100644
--- a/subcontracting/locale/en/fusiondirectory.po
+++ b/subcontracting/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/sudo/locale/en/fusiondirectory.po b/sudo/locale/en/fusiondirectory.po
index c7b62f89a7..b5ff21484f 100644
--- a/sudo/locale/en/fusiondirectory.po
+++ b/sudo/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -55,7 +55,7 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:123
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,78 +64,78 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
 
diff --git a/supann/locale/en/fusiondirectory.po b/supann/locale/en/fusiondirectory.po
index 9c43e8cf65..9bf4e9871f 100644
--- a/supann/locale/en/fusiondirectory.po
+++ b/supann/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/sympa/locale/en/fusiondirectory.po b/sympa/locale/en/fusiondirectory.po
index 637670f1a7..d12be6d54f 100644
--- a/sympa/locale/en/fusiondirectory.po
+++ b/sympa/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/systems/locale/en/fusiondirectory.po b/systems/locale/en/fusiondirectory.po
index 545cd9c63a..79d7124db3 100644
--- a/systems/locale/en/fusiondirectory.po
+++ b/systems/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/user-reminder/locale/en/fusiondirectory.po b/user-reminder/locale/en/fusiondirectory.po
index 51062596c7..32bd8128dd 100644
--- a/user-reminder/locale/en/fusiondirectory.po
+++ b/user-reminder/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/weblink/locale/en/fusiondirectory.po b/weblink/locale/en/fusiondirectory.po
index 067e3154d7..b04cec1336 100644
--- a/weblink/locale/en/fusiondirectory.po
+++ b/weblink/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/webservice/locale/en/fusiondirectory.po b/webservice/locale/en/fusiondirectory.po
index d9a12fd9ae..18c64e5b70 100644
--- a/webservice/locale/en/fusiondirectory.po
+++ b/webservice/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-10-15 16:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -31,24 +31,24 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid ""
 "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid ""
 "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-- 
GitLab


From 5ac3c221c614b2c219580f4610f3b27f398cf668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 24 Oct 2016 09:20:29 +0200
Subject: [PATCH 10/54] Fixes #5198 Pulling 1.1 DHCP plugin

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc   | 611 +++++++++++++++
 dhcp/admin/dhcp/class_dhcpManagement.inc      |  50 ++
 dhcp/admin/dhcp/class_dhcpPlugin.inc          | 142 ++++
 .../class_dhcpSectionCreationDialog.inc}      |  60 +-
 dhcp/admin/dhcp/main.inc                      |  22 +
 dhcp/admin/dhcp/sections/class_dhcpClass.inc  |  24 +
 .../admin/dhcp/sections/class_dhcpDnsZone.inc |  64 ++
 dhcp/admin/dhcp/sections/class_dhcpGroup.inc  |  24 +
 dhcp/admin/dhcp/sections/class_dhcpHost.inc   |  61 ++
 dhcp/admin/dhcp/sections/class_dhcpPool.inc   |  47 ++
 .../admin/dhcp/sections/class_dhcpService.inc |  38 +
 .../dhcp/sections/class_dhcpSharedNetwork.inc |  37 +
 .../dhcp/sections/class_dhcpSubClass.inc      |  24 +
 dhcp/admin/dhcp/sections/class_dhcpSubnet.inc |  50 ++
 .../admin/dhcp/sections/class_dhcpTSigKey.inc |  52 ++
 dhcp/admin/systems/class_dhcpSystem.inc       | 299 ++++++++
 .../services/dhcp/class_dhcpAdvanced.inc      | 166 -----
 .../systems/services/dhcp/class_dhcpClass.inc | 123 ---
 .../services/dhcp/class_dhcpDnsZone.inc       | 202 -----
 .../systems/services/dhcp/class_dhcpGroup.inc | 123 ---
 .../systems/services/dhcp/class_dhcpHost.inc  | 174 -----
 .../services/dhcp/class_dhcpNetwork.inc       | 216 ------
 .../services/dhcp/class_dhcpOption.inc        | 117 ---
 .../services/dhcp/class_dhcpPlugin.inc        | 171 -----
 .../systems/services/dhcp/class_dhcpPool.inc  | 189 -----
 .../services/dhcp/class_dhcpService.inc       | 170 -----
 .../services/dhcp/class_dhcpSharedNetwork.inc | 196 -----
 .../services/dhcp/class_dhcpSubClass.inc      | 122 ---
 .../services/dhcp/class_dhcpSubnet.inc        | 207 ------
 .../services/dhcp/class_dhcpTSigKey.inc       | 163 ----
 .../services/dhcp/class_serviceDHCP.inc       | 574 +-------------
 .../systems/services/dhcp/dhcpNewSection.tpl  |  25 -
 .../systems/services/dhcp/dhcp_advanced.tpl   |  62 --
 .../systems/services/dhcp/dhcp_dnszone.tpl    |  39 -
 .../systems/services/dhcp/dhcp_group.tpl      |  24 -
 .../admin/systems/services/dhcp/dhcp_host.tpl |  60 --
 .../systems/services/dhcp/dhcp_network.tpl    | 114 ---
 .../admin/systems/services/dhcp/dhcp_pool.tpl |  32 -
 .../systems/services/dhcp/dhcp_service.tpl    |  51 --
 .../services/dhcp/dhcp_sharedNetwork.tpl      | 125 ----
 .../systems/services/dhcp/dhcp_subnet.tpl     |  58 --
 .../systems/services/dhcp/dhcp_tsigkey.tpl    |  37 -
 .../systems/services/dhcp/remove_dhcp.tpl     |  17 -
 .../systems/services/dhcp/serviceDHCP.tpl     |  14 -
 dhcp/config/dhcp/class_dhcpConfig.inc         |  53 ++
 dhcp/contrib/openldap/dhcp-fd-conf.schema     |  18 +
 dhcp/contrib/openldap/dhcp.schema             | 462 ++++++++++++
 dhcp/locale/ar/fusiondirectory.po             | 571 +++++---------
 dhcp/locale/ca/fusiondirectory.po             | 571 +++++---------
 dhcp/locale/cs_CZ/fusiondirectory.po          | 703 ++++++------------
 dhcp/locale/de/fusiondirectory.po             | 685 ++++++-----------
 dhcp/locale/el_GR/fusiondirectory.po          | 653 ++++++----------
 dhcp/locale/en/fusiondirectory.po             | 559 ++++----------
 dhcp/locale/es/fusiondirectory.po             | 683 ++++++-----------
 dhcp/locale/es_CO/fusiondirectory.po          | 571 +++++---------
 dhcp/locale/es_VE/fusiondirectory.po          | 683 ++++++-----------
 dhcp/locale/fa_IR/fusiondirectory.po          | 571 +++++---------
 dhcp/locale/fi_FI/fusiondirectory.po          | 571 +++++---------
 dhcp/locale/fr/fusiondirectory.po             | 694 ++++++-----------
 dhcp/locale/hu_HU/fusiondirectory.po          | 571 +++++---------
 dhcp/locale/id/fusiondirectory.po             | 570 +++++---------
 dhcp/locale/it_IT/fusiondirectory.po          | 687 ++++++-----------
 dhcp/locale/lv/fusiondirectory.po             | 571 +++++---------
 dhcp/locale/nb/fusiondirectory.po             | 571 +++++---------
 dhcp/locale/nl/fusiondirectory.po             | 683 ++++++-----------
 dhcp/locale/pl/fusiondirectory.po             | 583 +++++----------
 dhcp/locale/pt/fusiondirectory.po             | 571 +++++---------
 dhcp/locale/pt_BR/fusiondirectory.po          | 611 +++++----------
 dhcp/locale/ru/fusiondirectory.po             | 608 +++++----------
 dhcp/locale/ru@petr1708/fusiondirectory.po    | 570 +++++---------
 dhcp/locale/sv/fusiondirectory.po             | 675 ++++++-----------
 dhcp/locale/ug/fusiondirectory.po             | 570 +++++---------
 dhcp/locale/vi_VN/fusiondirectory.po          | 571 +++++---------
 dhcp/locale/zh/fusiondirectory.po             | 577 +++++---------
 74 files changed, 7276 insertions(+), 14937 deletions(-)
 create mode 100644 dhcp/admin/dhcp/class_dhcpConfiguration.inc
 create mode 100644 dhcp/admin/dhcp/class_dhcpManagement.inc
 create mode 100644 dhcp/admin/dhcp/class_dhcpPlugin.inc
 rename dhcp/admin/{systems/services/dhcp/class_dhcpNewSectionDialog.inc => dhcp/class_dhcpSectionCreationDialog.inc} (63%)
 create mode 100644 dhcp/admin/dhcp/main.inc
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpClass.inc
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpDnsZone.inc
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpGroup.inc
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpHost.inc
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpPool.inc
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpService.inc
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpSharedNetwork.inc
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpSubClass.inc
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpSubnet.inc
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpTSigKey.inc
 create mode 100644 dhcp/admin/systems/class_dhcpSystem.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpClass.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpHost.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpOption.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpPool.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpService.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/class_dhcpTSigKey.inc
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcpNewSection.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcp_dnszone.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcp_group.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcp_host.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcp_network.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcp_pool.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcp_service.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/dhcp_tsigkey.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/remove_dhcp.tpl
 delete mode 100644 dhcp/admin/systems/services/dhcp/serviceDHCP.tpl
 create mode 100644 dhcp/config/dhcp/class_dhcpConfig.inc
 create mode 100644 dhcp/contrib/openldap/dhcp-fd-conf.schema
 create mode 100644 dhcp/contrib/openldap/dhcp.schema

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
new file mode 100644
index 0000000000..37cc726b7e
--- /dev/null
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -0,0 +1,611 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2003-2010  Cajus Pollmeier
+  Copyright (C) 2011-2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
+{
+  protected $dialogClass = 'DhcpSectionCreationDialog';
+
+  protected $subnet_expanded = FALSE;
+  protected $dhcpObjectCache = array();
+
+  protected function getAttributeArrayValue($key, $value)
+  {
+    $id = $this->getHtmlId();
+    $subnetExpandImg = $this->renderInputField(
+      'image', $id.'_expandDHCP_'.$key,
+      array(
+        'src'   => 'images/lists/expand.png',
+        'title' => _('Expand DHCP subnet'),
+        'alt'   => _('Expand'),
+        'class' => 'center',
+        'style' => 'padding:5px 6px 4px;'
+      )
+    );
+    $subnetExpandedImg = $this->renderInputField(
+      'image', $id.'_foldDHCP_'.$key,
+      array(
+        'src'   => 'images/down-arrow.png',
+        'title' => _('Fold DHCP subnet'),
+        'alt'   => _('Fold'),
+        'class' => 'center',
+        'style' => 'padding:6px 5px 6px 4px;'
+      )
+    );
+    $dn = $value[0];
+    if (empty($this->dhcpObjectCache[$dn])) {
+      return array('not in cache',$dn,'');
+    }
+
+    //~ $link = "<a href='?plug=".$_GET['plug']."&act=edit&id=".$key."'>".$value[1]."</a>";
+    $link = $value[1];
+
+    $objtype = $this->objectType($dn);
+    $dhcpObject = new $objtype($this->plugin, $dn, $this->dhcpObjectCache[$dn]);
+    if (count(dhcpConfiguration::$sectionMap[$objtype])) {
+      if ($objtype == 'dhcpService') {
+        if ($dn === $this->subnet_expanded) {
+          $link = $subnetExpandedImg.$link;
+        } else {
+          $link = $subnetExpandImg.$link;
+        }
+        return array(
+          array('html' => $link),
+          '',
+          '',
+        );
+      } else {
+        if ($objtype == 'dhcpSubnet') {
+          if ($dn === $this->subnet_expanded) {
+            $link = '&nbsp;&nbsp;'.$subnetExpandedImg.$link;
+          } else {
+            $link = '&nbsp;&nbsp;'.$subnetExpandImg.$link;
+          }
+        }
+        return array(
+          array('html' => $link),
+          array('html' => $dhcpObject->getOption('routers')),
+          ''
+        );
+      }
+    } else {
+      return array(
+        array('html' => $link),
+        array('html' => $dhcpObject->getStatement('fixed-address')),
+        array('html' => preg_replace('/^[^ ]+ /', '', isset($dhcpObject->dhcpHWAddress) ? $dhcpObject->dhcpHWAddress : '')),
+      );
+    }
+  }
+
+  protected function genRowIcons($key, $value)
+  {
+    $id = $this->getHtmlId();
+    list ($img, $width) = parent::genRowIcons($key, $value);
+    $img = $this->renderInputField(
+      'image', $id.'_insertDHCP_'.$key,
+      array(
+        'src'   => 'geticon.php?context=actions&amp;icon=document-new&amp;size=16',
+        'title' => _('Insert new DHCP section'),
+        'alt'   => _('Insert new DHCP section'),
+        'class' => 'center',
+      )
+    ).'&nbsp;'.$img;
+    $width += 18;
+
+    return array ($img, $width);
+  }
+
+  protected function handlePostValueActions($id, $postValue)
+  {
+    if (parent::handlePostValueActions($id, $postValue)) {
+      return TRUE;
+    }
+    if (preg_match('/^'.$id.'_expandDHCP_/', $postValue)) {
+      $key = preg_replace('/^'.$id.'_expandDHCP_/', '', $postValue);
+      $key = preg_replace('/_[xy]$/', '', $key);
+
+      $this->subnet_expanded = $this->value[$key][0];
+      $this->reload(FALSE);
+      $this->postValue = $this->value;
+
+      return TRUE;
+    }
+    if (preg_match('/^'.$id.'_foldDHCP_/', $postValue)) {
+      $this->subnet_expanded = FALSE;
+      $this->reload(FALSE);
+      $this->postValue = $this->value;
+
+      return TRUE;
+    }
+    if (preg_match('/^'.$id.'_insertDHCP_/', $postValue)) {
+      $key = preg_replace('/^'.$id.'_insertDHCP_/', '', $postValue);
+      $key = preg_replace('/_[xy]$/', '', $key);
+
+      $dn = $this->value[$key][0];
+      $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this, $this->objectType($dn), $dn));
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  protected function handleEdit($key)
+  {
+    $dn           = $this->value[$key][0];
+    $editingValue = $this->dhcpObjectCache[$dn];
+    $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this, $this->objectType($dn), $dn, $editingValue));
+  }
+
+  function delPostValue($key)
+  {
+    $dn = $this->postValue[$key][0];
+    $this->dhcpObjectCache[$dn] = array();
+    foreach ($this->postValue as $i => $value) {
+      if (preg_match('/'.preg_quote($dn, '/').'$/', $value[0])) {
+        unset($this->postValue[$i]);
+        $this->dhcpObjectCache[$value[0]] = array();
+      }
+    }
+    parent::delPostValue($key);
+  }
+
+  /* Should be addValue but we need more attributes */
+  function editEnded($dn, $object, $olddn = FALSE)
+  {
+    $this->dhcpObjectCache[$dn] = $object;
+    if (($olddn !== FALSE) && ($olddn !== $dn)) {
+      /* If we renamed a section, we've to rename a couple of objects, too */
+      foreach ($this->dhcpObjectCache as $key => $dsc) {
+        if (preg_match("/,$olddn$/", $key)) {
+          $new_dn = preg_replace("/,$olddn$/", ','.$dn, $key);
+          $dsc['MODIFIED'] = TRUE;
+          $this->dhcpObjectCache[$new_dn] = $dsc;
+          $this->dhcpObjectCache[$key]    = array();
+        }
+      }
+      $this->dhcpObjectCache[$olddn]    = array();
+    }
+    $this->reload(FALSE);
+  }
+
+  /* Used by dhcpHost */
+  function addHost($parentDn, $cn, $mac, $ip)
+  {
+    $dn = 'cn='.$cn.','.$parentDn;
+    $this->dhcpObjectCache[$dn] = array(
+      'dn'              => $dn,
+      'objectClass'     => array('dhcpHost'),
+      'cn'              => array($cn),
+      'dhcpHWAddress'   => array('ethernet '.$mac),
+      'dhcpStatements'  => array(
+        'host-name '.$cn,
+        'fixed-address '.$ip
+      ),
+      'dhcpOption'      => array(),
+      'dhcpComments'    => array(),
+      'MODIFIED'        => TRUE,
+    );
+    $this->reload(FALSE);
+  }
+
+  /* Used by dhcpHost */
+  function delHost($dn)
+  {
+    $this->dhcpObjectCache[$dn] = array();
+  }
+
+  protected function loadAttrValue ($attrs)
+  {
+  }
+
+  /* Not saving anything into base node */
+  function fillLdapValue (&$attrs)
+  {
+    /* Remove crap made by plugin */
+    unset ($attrs[$this->getLdapName()]);
+  }
+
+  function setParent (&$plugin)
+  {
+    parent::setParent($plugin);
+    if (is_object($this->plugin)) {
+      $this->reload();
+    }
+  }
+
+  function check ()
+  {
+    $error = parent::check();
+    if (!empty($error)) {
+      return $error;
+    }
+    if (empty($this->value) || empty($this->dhcpObjectCache[$this->value[0][0]]['cn']) || ($this->dhcpObjectCache[$this->value[0][0]]['cn'][0] == '')) {
+      return msgPool::required(_('Name'));
+    }
+  }
+
+  /* Subfonction of reload function */
+  protected function reload_readItemFromLDAP(&$ldap, $attrs, &$final, $erase)
+  {
+    global $config;
+    $sattrs = array();
+    $dn     = $attrs['dn'];
+
+    if (isset($this->dhcpObjectCache[$dn]) && !$erase) {
+      $sattrs = $this->dhcpObjectCache[$dn];
+    } else {
+      for ($i = 0; $i < $attrs['count']; $i++) {
+        $sattrs[$attrs[$i]] = $attrs[$attrs[$i]];
+        unset($sattrs[$attrs[$i]]['count']);
+      }
+      $sattrs['dn'] = $dn;
+      foreach ($sattrs as $name => $values) {
+        if ($name == 'dhcpOption') {
+          foreach ($values as $key => $value) {
+            $value_name   = trim(preg_replace('/[^ ]*$/', '', $value));
+            $value_value  = trim(preg_replace('/^[^ ]*/', '', $value));
+            if (in_array($value_name, dhcpConfiguration::$quote_option)) {
+              $value_value = preg_replace('/^"/', '', $value_value);
+              $value_value = preg_replace('/"$/', '', $value_value);
+              $sattrs[$name][$key] = $value_name.' '.$value_value;
+            }
+          }
+        }
+      }
+      $this->dhcpObjectCache[$dn] = $sattrs;
+    }
+
+    if ($dn === $this->subnet_expanded) {
+      $ldap_subnet = $config->get_ldap_link();
+      $ldap_subnet->cd($dn);
+      $ldap_subnet->search('(objectClass=dhcpHost)', array('*'), 'one');
+      while ($host_attrs = $ldap_subnet->fetch()) {
+        $this->reload_readItemFromLDAP($ldap_subnet, $host_attrs, $final, $erase);
+      }
+    }
+  }
+
+  /* Subfonction of reload function */
+  protected function reload_refreshListFromCache(&$final)
+  {
+    $firstdn = NULL;
+    foreach ($this->dhcpObjectCache as $dn => $sattrs) {
+      if (empty($sattrs)) {
+        continue;
+      }
+      if ($firstdn === NULL) {
+        $firstdn = $dn;
+      }
+      $type_id = NULL;
+      foreach ($this->plugin->types as $key => $val) {
+        if (in_array($key, $sattrs['objectClass'])) {
+          $type     = $val;
+          $type_id  = $key;
+          break;
+        }
+      }
+      if ($type_id === NULL) {
+        trigger_error('Unknown DHCP type for '.$dn);
+      }
+
+      if (($type_id == 'dhcpHost') && (preg_replace('/^[^,]+,/', '', $dn) != $this->subnet_expanded)) {
+        continue;
+      }
+
+      $tmp = preg_replace('/'.preg_quote($firstdn, '/').'/', '', $dn);
+      $indent = substr_count($tmp, ',');
+      if ($type_id == 'dhcpSubnet') {
+        $indent--;
+      }
+      if ($indent > 0) {
+        if ($type_id == 'dhcpSubnet') {
+          $spaces = "&nbsp;&nbsp;&nbsp;";
+        } else {
+          $spaces = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
+        }
+      } else {
+        $spaces = '';
+      }
+      for ($i = 0; $i < $indent; $i++) {
+        $spaces .= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
+      }
+
+      /* Prepare for sorting... */
+      $sortpart = explode(',', $dn);
+      $sortpart = array_reverse($sortpart);
+      $tmp = implode(',', $sortpart);
+      $final[$dn] = $tmp.'!'.$spaces.$type.' "'.$sattrs['cn'][0].'"';
+    }
+  }
+
+  function reload($erase = TRUE)
+  {
+    global $config;
+    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $erase, 'reload');
+    /* Init LDAP and load list */
+    $ldap = $config->get_ldap_link();
+
+    $final  = array();
+    $ldap->cat($this->plugin->dn, array('cn'), '(objectClass=dhcpService)');
+
+    if ($value = $ldap->fetch()) {
+      /* Set header */
+      $sortpart = explode(',', $value['dn']);
+      $sortpart = array_reverse($sortpart);
+      $tmp = implode(',', $sortpart);
+
+      if ($erase || !isset($this->dhcpObjectCache[$value['dn']]) || !empty($this->dhcpObjectCache[$value['dn']])) {
+        $final[$value['dn']] = $tmp.'!'._('Global options');
+      }
+
+      /* Read all sub entries to place here */
+      $ldap->cd($value['dn']);
+      $ldap->search('(|(objectClass=dhcpService)(objectClass=dhcpClass)(objectClass=dhcpSubClass)(objectClass=dhcpGroup)(objectClass=dhcpPool)(objectClass=dhcpSubnet)(objectClass=dhcpSharedNetwork)(objectClass=dhcpTSigKey)(objectClass=dhcpDnsZone)(objectClass=dhcpFailOverPeer))', array());
+
+      while ($attrs = $ldap->fetch()) {
+        $this->reload_readItemFromLDAP($ldap, $attrs, $final, $erase);
+      }
+    }
+    $this->reload_refreshListFromCache($final);
+
+    /* Sort it... */
+    natsort($final);
+    $this->value = array();
+    foreach ($final as $dn => $val) {
+      $this->value[] = array($dn, preg_replace('/^[^!]+!(.*)$/', '\\1', $val));
+    }
+
+    if (empty($final)) {
+      $this->add_global_node();
+    }
+  }
+
+  function add_global_node()
+  {
+    $attrs = array(
+      'dn'              => $this->plugin->dn,
+      'cn'              => array($this->plugin->cn),
+      'objectClass'     => array('top', 'dhcpService'),
+      //~ 'dhcpPrimaryDN'   => array($this->plugin->dn),
+      'dhcpStatements'  => array(
+        'default-lease-time 600',
+        'max-lease-time 1200',
+        'authoritative',
+        'ddns-update-style none'
+      ),
+      'MODIFIED' => TRUE,
+    );
+
+    $this->value[] = array($this->plugin->dn, _('Global options'));
+    $this->dhcpObjectCache[$this->plugin->dn]  = $attrs;
+  }
+
+  function objectType($dn)
+  {
+    $types = array_keys($this->plugin->types);
+
+    foreach ($this->dhcpObjectCache[$dn]['objectClass'] as $oc) {
+      if (in_array($oc, $types)) {
+        return $oc;
+      }
+    }
+
+    /* That should not happen... */
+    msg_dialog::display(_('Error'), _('The DHCP configuration set is unkown. Please contact your system administrator.'), ERROR_DIALOG);
+
+    return '';
+  }
+
+  function getCache()
+  {
+    return $this->dhcpObjectCache;
+  }
+
+  function renderButtons ()
+  {
+    return '';
+  }
+
+  public function htmlIds()
+  {
+    $ids = parent::htmlIds();
+    unset($ids[0]);
+    return $ids;
+  }
+}
+
+class dhcpConfiguration extends simplePlugin
+{
+  public $mainTab = TRUE;
+
+  public $objectclasses = array('dhcpService');
+
+  public $types = array();
+
+  static $sectionMap = array(
+    'dhcpService'       => array(
+      'dhcpSharedNetwork','dhcpSubnet','dhcpGroup',
+      'dhcpHost','dhcpClass','dhcpTSigKey','dhcpDnsZone'
+    ),
+    'dhcpClass'         => array('dhcpSubClass'),
+    'dhcpSubClass'      => array(),
+    'dhcpHost'          => array(),
+    'dhcpGroup'         => array('dhcpHost'),
+    'dhcpPool'          => array(),
+    'dhcpSubnet'        => array(
+      'dhcpPool','dhcpGroup',
+      'dhcpHost','dhcpClass','dhcpTSigKey','dhcpDnsZone'
+    ),
+    'dhcpSharedNetwork' => array('dhcpSubnet', 'dhcpPool','dhcpTSigKey','dhcpDnsZone'),
+    'dhcpTSigKey'       => array(),
+    'dhcpDnsZone'       => array()
+  );
+
+  static $quote_option = array('domain-name');
+
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'   => _('DHCP configuration'),
+      'plDescription' => _('DHCP configuration'),
+      'plObjectType'  => array('dhcpConfiguration' => array(
+        'name'        => _('DHCP configuration'),
+        'filter'      => '(objectClass=dhcpService)',
+        'ou'          => get_ou('dhcpRDN'),
+        'icon'        => 'geticon.php?context=applications&icon=dhcp&size=16'
+      )),
+
+      'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('DHCP Objects'),
+        'class' => array('fullwidth'),
+        'attrs' => array(
+          new BaseSelectorAttribute(get_ou('dhcpRDN')),
+          //~ new HostNameAttribute (
+            //~ _('Name'), _('Name of this DHCP configuration'),
+            //~ 'cn', TRUE
+          //~ ),
+          new HiddenAttribute('cn'),
+          new DhcpSectionsAttribute (
+            '', _('The DHCP sections handled by this server'),
+            'dhcpSections', FALSE
+          )
+        )
+      )
+    );
+  }
+
+  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
+  {
+    $this->types = array(
+      'dhcpLog'           => _('Logging'),
+      'dhcpService'       => _('Global options'),
+      'dhcpClass'         => _('Class'),
+      'dhcpSubClass'      => _('Subclass'),
+      'dhcpHost'          => _('Host'),
+      'dhcpGroup'         => _('Group'),
+      'dhcpPool'          => _('Pool'),
+      'dhcpSubnet'        => _('Subnet'),
+      'dhcpFailOverPeer'  => _('Failover peer'),
+      'dhcpSharedNetwork' => _('Shared network'),
+      'dhcpTSigKey'       => _('DNS update key'),
+      'dhcpDnsZone'       => _('DNS update zones')
+    );
+
+    parent::__construct($dn, $object, $parent, $mainTab);
+
+    $this->attributesAccess['dhcpSections']->setHeight(400);
+  }
+
+  protected function shouldSave()
+  {
+    return TRUE;
+  }
+
+  protected function ldap_save()
+  {
+    global $config;
+    /* Save dhcp settings */
+    $ldap   = $config->get_ldap_link();
+    $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
+    $cache  = $this->attributesAccess['dhcpSections']->getCache();
+    $errors = array();
+    foreach ($cache as $dn => $data) {
+      if ($this->dn != $this->orig_dn) {
+        $dn = preg_replace('/'.preg_quote($this->orig_dn, '/').'$/i', $this->dn, $dn);
+      }
+
+      /* Remove entry? */
+      if (count($data) == 0) {
+        /* Check if exists, then remove... */
+        if ($ldap->cat($dn)) {
+          $ldap->rmdir_recursive($dn);
+          if (!$ldap->success()) {
+            $errors[] = msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class());
+          }
+        }
+        continue;
+      }
+
+      /* Modify existing entry? */
+      if (isset($data['MODIFIED']) || $this->orig_dn != $this->dn) {
+        if ($ldap->cat($dn)) {
+          $modify = TRUE;
+        } else {
+          $modify = FALSE;
+        }
+
+        /* Build new entry */
+        $attrs = array();
+        foreach ($data as $attribute => $values) {
+          if ($attribute == 'MODIFIED' || $attribute == 'dn') {
+            continue;
+          }
+
+          if (in_array($attribute, array('dhcpPrimaryDN','dhcpSecondaryDN','dhcpServerDN','dhcpFailOverPeerDN'))) {
+            foreach ($values as $v_key => $value) {
+              $values[$v_key] = preg_replace('/'.preg_quote($this->orig_dn, '/').'$/i', $this->dn, $value);
+            }
+          }
+
+          if (count($values)) {
+            if ($attribute == 'dhcpOption') {
+              foreach ($values as $key => $value) {
+                $option_name  = trim(preg_replace('/[^ ]*$/', '', $value));
+                $option_value = trim(preg_replace('/^[^ ]*/', '', $value));
+                if (in_array($option_name, static::$quote_option)) {
+                  $values[$key] = $option_name.' "'.$option_value.'"';
+                }
+              }
+            }
+            if ((count($values) == 1) && is_array($values)) {
+              $attrs[$attribute] = $values[0];
+            } else {
+              $attrs[$attribute] = $values;
+            }
+          } elseif ($modify) {
+            $attrs[$attribute] = array();
+          }
+        }
+
+        $ldap->cd($dn);
+        if ($modify) {
+          $ldap->modify($attrs);
+          if (!$ldap->success()) {
+            $errors[] = msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class());
+          }
+        } else {
+          $ldap->add($attrs);
+          if (!$ldap->success()) {
+            $errors[] = msgPool::ldaperror($ldap->get_error(), $dn, LDAP_ADD, get_class());
+          }
+        }
+      }
+    }
+
+    //~ parent::ldap_save();
+    return $errors;
+  }
+}
diff --git a/dhcp/admin/dhcp/class_dhcpManagement.inc b/dhcp/admin/dhcp/class_dhcpManagement.inc
new file mode 100644
index 0000000000..80c4f447be
--- /dev/null
+++ b/dhcp/admin/dhcp/class_dhcpManagement.inc
@@ -0,0 +1,50 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2015-2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpManagement extends simpleManagement
+{
+  protected $objectTypes  = array('dhcpConfiguration');
+
+  protected $departmentBrowser      = TRUE;
+  protected $departmentRootVisible  = TRUE;
+  protected $baseMode               = TRUE;
+
+  protected $autoFilterAttributes = array('dn', 'cn', 'description');
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'   => _('DHCP'),
+      'plDescription' => _('DHCP Management'),
+      'plIcon'        => 'geticon.php?context=applications&icon=dhcp&size=48',
+      'plSection'     => 'systems',
+      'plPriority'    => 2,
+      'plManages'     => array('dhcpConfiguration'),
+
+      'plProvidedAcls'  => array()
+    );
+  }
+
+  function __construct()
+  {
+    parent::__construct();
+  }
+}
+?>
diff --git a/dhcp/admin/dhcp/class_dhcpPlugin.inc b/dhcp/admin/dhcp/class_dhcpPlugin.inc
new file mode 100644
index 0000000000..3afcd2b888
--- /dev/null
+++ b/dhcp/admin/dhcp/class_dhcpPlugin.inc
@@ -0,0 +1,142 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpPlugin extends simplePlugin
+{
+  public $mainTab = TRUE;
+
+  protected $base;
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('DHCP'),
+        'attrs' => array(
+          new HostNameAttribute (
+            _('Name'), _('Name of this DHCP configuration'),
+            'cn', TRUE
+          ),
+          new OrderedArrayAttribute (
+            new StringAttribute(
+              _('Options'), _('The DHCP options'),
+              'dhcpOption', FALSE
+            ),
+            // Order disabled, Default values, Edit enabled
+            FALSE, array(), TRUE
+          ),
+          new OrderedArrayAttribute (
+            new StringAttribute(
+              _('Statements'), _('The DHCP statements'),
+              'dhcpStatements', FALSE
+            ),
+            FALSE, array(), TRUE
+          ),
+          new TextAreaAttribute (
+            _('Comments'), _('Comments about this DHCP object'),
+            'dhcpComments', FALSE
+          ),
+        )
+      )
+    );
+  }
+
+  function __construct ($plugin, $dn, $attrs = NULL)
+  {
+    global $config;
+    if (is_array($attrs)) {
+      foreach ($attrs as $key => &$value) {
+        if (is_array($value)) {
+          if (empty($value)) {
+            unset($attrs[$key]);
+          } else {
+            $value['count'] = count($value);
+          }
+        } else {
+          $value = array(
+            $value,
+            'count' => 1
+          );
+        }
+      }
+      unset($value);
+      $attrsWrapper = new stdClass();
+      $attrsWrapper->attrs = $attrs;
+      if ($dn == 'new') {
+        $this->base = get_ou('dhcpRDN').$plugin->base;
+      } else {
+        $this->base = dn2base($dn);
+      }
+      parent::__construct($dn, $attrsWrapper);
+    } elseif ($dn == 'new') {
+      $this->base = $attrs;
+      parent::__construct($dn);
+    } else {
+      trigger_error('Invalid use of dhcpPlugin class');
+    }
+    $this->set_acl_base($this->base);
+  }
+
+  function execute()
+  {
+    return parent::execute()."\n".
+    '<p class="plugbottom">'."\n".
+    '  <input type="submit" name="dhcp_save" value="'.msgPool::addButton().'"/>&nbsp;'."\n".
+    '  <input type="submit" name="dhcp_cancel" value="'.msgPool::cancelButton().'"/>'."\n".
+    '</p>';
+  }
+
+  function save()
+  {
+    $this->dn = $this->compute_dn();
+    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'save');
+    $this->prepare_save();
+    $this->attrs['cn']          = array($this->cn);
+    $this->attrs['objectClass'] = $this->objectclasses;
+    $this->attrs['dn']          = $this->dn;
+    $this->attrs['MODIFIED']    = TRUE;
+    return $this->attrs;
+  }
+
+  function compute_dn()
+  {
+    return 'cn='.ldap_escape_dn($this->attributesAccess['cn']->computeLdapValue()).','.$this->base;
+  }
+
+  function getOption($option)
+  {
+    foreach ($this->dhcpOption as $line) {
+      if (preg_match('/^'.preg_quote($option, '/').' (.*)$/', $line, $m)) {
+        return $m[1];
+      }
+    }
+    return NULL;
+  }
+
+  function getStatement($statement)
+  {
+    foreach ($this->dhcpStatements as $line) {
+      if (preg_match('/^'.preg_quote($statement, '/').' (.*)$/', $line, $m)) {
+        return $m[1];
+      }
+    }
+    return NULL;
+  }
+}
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc b/dhcp/admin/dhcp/class_dhcpSectionCreationDialog.inc
similarity index 63%
rename from dhcp/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc
rename to dhcp/admin/dhcp/class_dhcpSectionCreationDialog.inc
index 1aaf4d5aa4..864c04ca23 100644
--- a/dhcp/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc
+++ b/dhcp/admin/dhcp/class_dhcpSectionCreationDialog.inc
@@ -19,7 +19,6 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-
 class DhcpSectionCreationDialog extends GenericDialog
 {
   protected $post_cancel = 'cancel_section';
@@ -28,6 +27,7 @@ class DhcpSectionCreationDialog extends GenericDialog
   protected $parentdn;
   protected $plugin;
   protected $initialObjectValue;
+  protected $selectAttribute;
 
   function __construct($simplePlugin, &$attribute, $classtype, $parentdn, $editingValue = NULL)
   {
@@ -38,21 +38,35 @@ class DhcpSectionCreationDialog extends GenericDialog
     if ($editingValue === NULL) {
       $this->dialog = FALSE;
     } else {
-      $this->dialog = new $classtype($this->plugin, $editingValue);
+      $this->dialog = new $classtype($this->plugin, $editingValue['dn'], $editingValue);
     }
     $this->initialObjectValue = $editingValue;
+
+    $sections = dhcpConfiguration::$sectionMap[$this->classtype];
+    $t_sections = array();
+    foreach ($sections as $section) {
+      $t_sections[$section] = $this->plugin->types[$section];
+    }
+    asort($t_sections);
+    $this->selectAttribute = new SelectAttribute(
+      _('Section'), _('Choose section type to create'),
+      'dhcpSectionType', TRUE,
+      array_keys($t_sections), '', array_values($t_sections)
+    );
   }
 
   function execute ()
   {
     if ($this->dialog !== FALSE) {
-      if (isset($_POST['cancel_dhcp'])) {
+      if (isset($_POST['dhcp_cancel'])) {
         return $this->handle_cancel();
       }
-      if (isset($_POST['save_dhcp'])) {
+      if (isset($_POST['dhcp_save'])) {
         return $this->save_dhcp();
       }
     } else {
+      $this->selectAttribute->loadPostValue();
+      $this->selectAttribute->applyPostValue();
       if (isset($_POST[$this->post_cancel])) {
         return $this->handle_cancel();
       }
@@ -70,26 +84,34 @@ class DhcpSectionCreationDialog extends GenericDialog
       return $this->dialog->execute();
     }
     $smarty   = get_smarty();
-    $display  = '';
 
-    $sections = serviceDHCP::$sectionMap[$this->classtype];
-    $t_sections = array();
-    foreach ($sections as $section) {
-      $t_sections[$section] = $this->plugin->types[$section];
-    }
-    asort($t_sections);
-    $ui = get_userinfo();
-    $smarty->assign('sections', $t_sections);
-    $display .= $smarty->fetch(get_template_path('dhcpNewSection.tpl', TRUE, dirname(__FILE__)));
-    return $display;
+    $smarty->assign('section',        _('Create new DHCP section'));
+    $smarty->assign('sectionId',      'dhcpCreation');
+    $smarty->assign('sectionClasses', '');
+    $attributes = array();
+    $smarty->assign($this->selectAttribute->getAcl().'ACL', 'rwcdm');
+    $this->selectAttribute->renderAttribute($attributes, FALSE);
+    $smarty->assign('attributes', $attributes);
+    $sections = array(
+      'dhcp' => $smarty->fetch(get_template_path('simpleplugin_section.tpl'))
+    );
+    $smarty->assign('sections', $sections);
+    $smarty->assign('hiddenPostedInput', get_class($this).'_posted');
+    $smarty->assign('focusedField', $this->selectAttribute->getLdapName());
+
+    return $smarty->fetch(get_template_path('simpleplugin.tpl'))."\n".
+    '<p class="plugbottom">'."\n".
+    '  <input type="submit" name="'.$this->post_finish.'" value="'.msgPool::addButton().'"/>&nbsp;'."\n".
+    '  <input type="submit" name="'.$this->post_cancel.'" value="'.msgPool::cancelButton().'"/>'."\n".
+    '</p>';
   }
 
   function handle_finish ()
   {
-    $section = $_POST['section'];
+    $section = $this->selectAttribute->getValue();
 
-    if (isset(serviceDHCP::$sectionMap[$section])) {
-      $this->dialog   = new $section($this->plugin, $this->parentdn);
+    if (isset(dhcpConfiguration::$sectionMap[$section])) {
+      $this->dialog   = new $section($this->plugin, 'new', $this->parentdn);
       $this->parentdn = FALSE;
       return $this->dialog->execute();
     } else {
@@ -116,7 +138,7 @@ class DhcpSectionCreationDialog extends GenericDialog
 
     $dn     = $this->dialog->dn;
     $data   = $this->dialog->save();
-    $this->attribute->editEnded($data['dn'], $data, ($this->parentdn === FALSE ? FALSE : $dn));
+    $this->attribute->editEnded($data['dn'], $data, ($this->parentdn === FALSE ? FALSE : $this->parentdn));
     return FALSE;
   }
 }
diff --git a/dhcp/admin/dhcp/main.inc b/dhcp/admin/dhcp/main.inc
new file mode 100644
index 0000000000..037d435646
--- /dev/null
+++ b/dhcp/admin/dhcp/main.inc
@@ -0,0 +1,22 @@
+<?php
+/*
+ * This code is part of FusionDirectory (http://www.fusiondirectory.org)
+ * Copyright (C) 2015-2016 FusionDirectory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+simpleManagement::mainInc('dhcpManagement');
+?>
diff --git a/dhcp/admin/dhcp/sections/class_dhcpClass.inc b/dhcp/admin/dhcp/sections/class_dhcpClass.inc
new file mode 100644
index 0000000000..428bc48172
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpClass.inc
@@ -0,0 +1,24 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpClass extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpClass');
+}
diff --git a/dhcp/admin/dhcp/sections/class_dhcpDnsZone.inc b/dhcp/admin/dhcp/sections/class_dhcpDnsZone.inc
new file mode 100644
index 0000000000..59c9403789
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpDnsZone.inc
@@ -0,0 +1,64 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpDnsZone extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpDnsZone');
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('DHCP'),
+        'attrs' => array(
+          new HostNameAttribute (
+            _('Name'), _('Name of this DHCP configuration'),
+            'cn', TRUE
+          ),
+          new StringAttribute (
+            _('DNS Zone Server'), _('Master server of the DNS Zone'),
+            'dhcpDnsZoneServer', TRUE
+          ),
+          new SelectAttribute (
+            _('Tsig key'), _('The TSig key DN'),
+            'dhcpKeyDN', FALSE
+          ),
+          new TextAreaAttribute (
+            _('Comments'), _('Comments about this DHCP object'),
+            'dhcpComments', FALSE
+          ),
+        )
+      )
+    );
+  }
+
+  function __construct ($plugin, $dn, $attrs = NULL)
+  {
+    global $config;
+    parent::__construct($plugin, $dn, $attrs);
+    $keys = array();
+    $ldap = $config->get_ldap_link();
+    $ldap->search('(objectClass=dhcpTSigKey)', array('dn','cn'));
+    while ($attrs = $ldap->fetch()) {
+      $keys[$attrs['dn']] = $attrs['cn'][0];
+    }
+    $this->attributesAccess['dhcpKeyDN']->setChoices(array_keys($keys), array_values($keys));
+  }
+}
diff --git a/dhcp/admin/dhcp/sections/class_dhcpGroup.inc b/dhcp/admin/dhcp/sections/class_dhcpGroup.inc
new file mode 100644
index 0000000000..8fc0976f92
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpGroup.inc
@@ -0,0 +1,24 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpGroup extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpGroup');
+}
diff --git a/dhcp/admin/dhcp/sections/class_dhcpHost.inc b/dhcp/admin/dhcp/sections/class_dhcpHost.inc
new file mode 100644
index 0000000000..b6ea0984a9
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpHost.inc
@@ -0,0 +1,61 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpHost extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpHost');
+
+  static function getAttributesInfo ()
+  {
+    $attributesInfo = parent::getAttributesInfo();
+    $attributesInfo['host'] = array(
+      'name'  => _('Host'),
+      'attrs' => array(
+        new CompositeAttribute(
+          _('The client hardware address'), 'dhcpHWAddress',
+          array(
+            new SelectAttribute (
+              '', _('The hardware address type'),
+              'dhcpHWAddress_type', TRUE,
+              array(  'ethernet',   'fddi',   'token-ring'), 'ethernet',
+              array(_('Ethernet'),_('FDDI'),_('Token Ring'))
+            ),
+            new StringAttribute (
+              '', _('The client hardware address'),
+              'dhcpHWAddress_address', FALSE
+            ),
+          ),
+          '/^([^ ]+) ([^ ]+)$/',
+          '%s %s',
+          '',
+          _('Hardware address')
+        )
+      )
+    );
+    $attributesInfo['host']['attrs'][0]->setLinearRendering(TRUE);
+    $attributesInfo['main']['attrs'][2]->setDefaultValue(
+      array(
+        'host-name cn',
+        'fixed-address ip',
+      )
+    );
+    return $attributesInfo;
+  }
+}
diff --git a/dhcp/admin/dhcp/sections/class_dhcpPool.inc b/dhcp/admin/dhcp/sections/class_dhcpPool.inc
new file mode 100644
index 0000000000..467eb48bf3
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpPool.inc
@@ -0,0 +1,47 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpPool extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpPool');
+
+  static function getAttributesInfo ()
+  {
+    $attributesInfo = parent::getAttributesInfo();
+    $attributesInfo['pool'] = array(
+      'name'  => _('Pool'),
+      'attrs' => array(
+        new SetAttribute (
+          new StringAttribute (
+            _('Range'), _('The starting & ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen. Each range is defined as a separate value.'),
+            'dhcpRange', TRUE
+          )
+        ),
+        new SetAttribute (
+          new StringAttribute (
+            _('Permit list'), _('This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value.'),
+            'dhcpPermitList', FALSE
+          )
+        ),
+      )
+    );
+    return $attributesInfo;
+  }
+}
diff --git a/dhcp/admin/dhcp/sections/class_dhcpService.inc b/dhcp/admin/dhcp/sections/class_dhcpService.inc
new file mode 100644
index 0000000000..9cfc858692
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpService.inc
@@ -0,0 +1,38 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpService extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpService');
+
+  static function getAttributesInfo ()
+  {
+    $attributesInfo = parent::getAttributesInfo();
+    $attributesInfo['main']['attrs'][2]->setDefaultValue(
+      array(
+        'default-lease-time 600',
+        'max-lease-time 1700',
+        'authoritative',
+        'ddns-update-style none'
+      )
+    );
+    return $attributesInfo;
+  }
+}
diff --git a/dhcp/admin/dhcp/sections/class_dhcpSharedNetwork.inc b/dhcp/admin/dhcp/sections/class_dhcpSharedNetwork.inc
new file mode 100644
index 0000000000..427d442cb8
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpSharedNetwork.inc
@@ -0,0 +1,37 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpSharedNetwork extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpSharedNetwork');
+
+  static function getAttributesInfo ()
+  {
+    $attributesInfo = parent::getAttributesInfo();
+    $attributesInfo['main']['attrs'][2]->setDefaultValue(
+      array(
+        'deny unknown-clients',
+        'deny bootp',
+        'deny booting',
+      )
+    );
+    return $attributesInfo;
+  }
+}
diff --git a/dhcp/admin/dhcp/sections/class_dhcpSubClass.inc b/dhcp/admin/dhcp/sections/class_dhcpSubClass.inc
new file mode 100644
index 0000000000..5db514339a
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpSubClass.inc
@@ -0,0 +1,24 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpSubClass extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpSubClass');
+}
diff --git a/dhcp/admin/dhcp/sections/class_dhcpSubnet.inc b/dhcp/admin/dhcp/sections/class_dhcpSubnet.inc
new file mode 100644
index 0000000000..58e6031dda
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpSubnet.inc
@@ -0,0 +1,50 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpSubnet extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpSubnet');
+
+  static function getAttributesInfo ()
+  {
+    $attributesInfo = parent::getAttributesInfo();
+    $attributesInfo['subnet'] = array(
+      'name'  => _('Subnet'),
+      'attrs' => array(
+        new IntAttribute (
+          _('Mask length'), _('The subnet mask length for the subnet. The mask can be easily computed from this length.'),
+          'dhcpNetMask', TRUE,
+          0, 255, 24
+        ),
+        new SetAttribute (
+          new StringAttribute (
+            _('Range'), _('The starting & ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen. Each range is defined as a separate value.'),
+            'dhcpRange', FALSE
+          )
+        ),
+      )
+    );
+    $attributesInfo['main']['attrs'][0] = new IPAttribute(
+      _('Network address'), _('Network address of this subnet'),
+      'cn', TRUE
+    );
+    return $attributesInfo;
+  }
+}
diff --git a/dhcp/admin/dhcp/sections/class_dhcpTSigKey.inc b/dhcp/admin/dhcp/sections/class_dhcpTSigKey.inc
new file mode 100644
index 0000000000..7b36e89e2e
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpTSigKey.inc
@@ -0,0 +1,52 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpTSigKey extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpTSigKey');
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('DHCP'),
+        'attrs' => array(
+          new HostNameAttribute (
+            _('Name'), _('Name of this DHCP configuration'),
+            'cn', TRUE
+          ),
+          new SelectAttribute (
+            _('Algorithm'), _('Algorithm to generate TSIG Key'),
+            'dhcpKeyAlgorithm', TRUE,
+            array('HMAC-MD5','RSAMD5','RSASHA1','DSA','DH')
+          ),
+          new StringAttribute (
+            _('Secret'), _('Secret to generate TSIG Key'),
+            'dhcpKeySecret', TRUE
+          ),
+          new TextAreaAttribute (
+            _('Comments'), _('Comments about this DHCP object'),
+            'dhcpComments', FALSE
+          ),
+        )
+      )
+    );
+  }
+}
diff --git a/dhcp/admin/systems/class_dhcpSystem.inc b/dhcp/admin/systems/class_dhcpSystem.inc
new file mode 100644
index 0000000000..e5752d22eb
--- /dev/null
+++ b/dhcp/admin/systems/class_dhcpSystem.inc
@@ -0,0 +1,299 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2015-2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class DhcpHostsAttribute extends OrderedArrayAttribute
+{
+  function __construct ($label, $description, $ldapName, array $values = array(), $acl = '')
+  {
+    $attribute = new CompositeAttribute(
+      $description, $ldapName,
+      array(
+        new SelectAttribute(
+          '', _('The DHCP configuration or subsection in which this host should be added'),
+          $ldapName.'_parent', TRUE
+        ),
+        new SelectAttribute(
+          '', _('The Mac address to use in the DHCP host record'),
+          $ldapName.'_mac', TRUE
+        ),
+        new SelectAttribute(
+          '', _('The IP address to use in the DHCP host record'),
+          $ldapName.'_ip', TRUE
+        ),
+        new HiddenAttribute(
+          'dn'
+        )
+      ),
+      FALSE,
+      FALSE,
+      $acl,
+      $label
+    );
+    parent::__construct($attribute, FALSE, $values, TRUE);
+  }
+
+  protected function loadAttrValue ($attrs)
+  {
+  }
+
+  protected function getAttributeArrayValue($key, $value)
+  {
+    return array_slice($value, 0, 3);
+  }
+
+  function setParent (&$plugin)
+  {
+    parent::setParent($plugin);
+    if (is_object($this->plugin)) {
+      if (!$this->plugin->is_template) {
+        $this->loadChoices();
+        $this->loadRecords();
+        $this->plugin->is_account = !empty($this->value);
+      } elseif (isset($this->plugin->attrs[$this->getLdapName()]['count'])) {
+        $this->value = array();
+        // TODO $this->loadAdditionalTemplatesValues();
+      }
+    }
+  }
+
+  function loadChoices()
+  {
+    $nodes = dhcpSystem::getDhcpParentNodes();
+    $macs   = $this->plugin->parent->getBaseObject()->macAddress;
+    if (!is_array($macs)) {
+      $macs = array($macs);
+    }
+    $ips    = $this->plugin->parent->getBaseObject()->ipHostNumber;
+    if (!is_array($ips)) {
+      $ips = array($ips);
+    }
+    $this->setChoices($nodes, $macs, $ips);
+  }
+
+  function setChoices(array $parentNodes, array $macs, array $ips)
+  {
+    $this->attribute->attributes[0]->setChoices(array_keys($parentNodes), array_values($parentNodes));
+    $this->attribute->attributes[1]->setChoices($macs);
+    $this->attribute->attributes[2]->setChoices($ips);
+  }
+
+  function loadRecords()
+  {
+    global $config;
+
+    $ldap = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    $ldap->search('(&(objectClass=dhcpHost)(cn='.$this->plugin->parent->getBaseObject()->cn.')(dhcpHWAddress=*))', array('dhcpStatements','dhcpHWAddress','dn'));
+    while ($attrs = $ldap->fetch()) {
+      $ip = '';
+      foreach ($attrs['dhcpStatements'] as $statement) {
+        if (preg_match('/fixed-address ([0-9\.]+)$/', $statement, $m)) {
+          $ip = $m[1];
+          break;
+        }
+      }
+      $this->value[] = array(
+        preg_replace('/^[^,]+,/', '', $attrs['dn']),
+        preg_replace('/ethernet (([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2}))/', '\\1', $attrs['dhcpHWAddress'][0]),
+        $ip,
+        $attrs['dn']
+      );
+    }
+    $this->initialValue = $this->getValue();
+  }
+
+  /* Special LDAP treatment that this attribute does after plugin ldap save */
+  function postLdapSave ($ldap, $fullrewrite, $ipchanged, $oldips, $newips, $macchanged, $oldmacs, $newmacs)
+  {
+    global $config;
+
+    if ($this->plugin->is_template) {
+      return;
+    }
+    /* FIXME - We should lock the object and check if we don’t erase changes */
+    $values   = $this->getValue();
+    $iValues  = $this->getInitialValue();
+    /* React to changes on main tab */
+    $cn       = $this->plugin->parent->getBaseObject()->cn;
+    if ($ipchanged) {
+      if ((count($oldips) == 1) && (count($newips) == 1)) {
+        foreach ($values as &$value) {
+          if ($value[2] == reset($oldips)) {
+            $value[2] = reset($newips);
+          }
+        }
+        unset($value);
+      } else {
+        $removedips = array_diff($oldips, $newips);
+        foreach ($values as $key => $value) {
+          if (in_array($value, $removedips)) {
+            unset($values[$key]);
+          }
+        }
+      }
+    }
+    if ($macchanged) {
+      if ((count($oldmacs) == 1) && (count($newmacs) == 1)) {
+        foreach ($values as &$value) {
+          if ($value[2] == reset($oldmacs)) {
+            $value[2] = reset($newmacs);
+          }
+        }
+        unset($value);
+      } else {
+        $removedmacs = array_diff($oldmacs, $newmacs);
+        foreach ($values as $key => $value) {
+          if (in_array($value, $removedmacs)) {
+            unset($values[$key]);
+          }
+        }
+      }
+    }
+
+    $valueHashes    = array_flip(array_map('join', $values));
+    //~ $iValueHashes   = array_flip(array_map('join', $iValues));
+    foreach ($iValues as $value) {
+      $hash = join($value);
+      if (isset($valueHashes[$hash]) && !$fullrewrite) {
+        unset($values[$valueHashes[$hash]]);
+        continue;
+      }
+      $configDn = $value[0];
+      if (preg_match('/([^,]+,'.preg_quote(get_ou('dhcpRDN')).'.*'.preg_quote($config->current['BASE']).')$/', $value[0], $m)) {
+        $configDn = $m[1];
+      } else {
+        trigger_error('Failed to parse '.$value[0].' to find DHCP configuration DN');
+      }
+      $dhcpTabs = objects::open($configDn, 'dhcpConfiguration');
+      $dhcpTabs->getBaseObject()->attributesAccess['dhcpSections']->delHost($value[3]);
+      $errors = $dhcpTabs->save();
+      msg_dialog::displayChecks($errors);
+    }
+    foreach ($values as $value) {
+      $configDn = $value[0];
+      if (preg_match('/([^,]+,'.preg_quote(get_ou('dhcpRDN')).'.*'.preg_quote($config->current['BASE']).')$/', $value[0], $m)) {
+        $configDn = $m[1];
+      } else {
+        trigger_error('Failed to parse '.$value[0].' to find DHCP configuration DN');
+      }
+      $dhcpTabs = objects::open($configDn, 'dhcpConfiguration');
+      $dhcpTabs->getBaseObject()->attributesAccess['dhcpSections']->addHost($value[0], $cn, $value[1], $value[2]);
+      $errors = $dhcpTabs->save();
+      msg_dialog::displayChecks($errors);
+    }
+    /* TODO
+     * ? handle modification somehow (if we want to keep statements when changing IP, not sure about this)
+     * We should also look into what should be possible or not, like IP, Mac or cn duplication.
+     * */
+  }
+}
+
+class dhcpSystem extends simplePlugin
+{
+  var $objectclasses = array();
+
+  protected $zonesCache;
+  protected $loaded = FALSE;
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP'),
+      'plDescription'   => _('Edit the DHCP zones of a system'),
+      'plIcon'          => 'geticon.php?context=applications&icon=dhcp&size=48',
+      'plSmallIcon'     => 'geticon.php?context=applications&icon=dhcp&size=16',
+      'plObjectType'    => array('server','workstation','terminal','printer','component','winstation','phone','mobilePhone'),
+      'plPriority'      => 4,
+
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('DHCP zones'),
+        'class' => array('fullwidth'),
+        'attrs' => array(
+          new DhcpHostsAttribute(
+            '', _('DHCP hosts declared for this system'),
+            'dhcpHosts'
+          )
+        )
+      ),
+    );
+  }
+
+  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
+  {
+    parent::__construct($dn, $object, $parent, $mainTab);
+    $this->ignore_account = FALSE;
+  }
+
+  function is_this_account($attrs)
+  {
+    /* Will not work when call from constructor (or when $attrs is not us)
+     * See DhcpHostsAttribute::setParent which sets is_account later
+     * */
+    return (count($this->dhcpHosts) > 0);
+  }
+
+  static function getDhcpParentNodes()
+  {
+    global $config;
+    $ldap = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    $ldap->search('(|(objectClass=dhcpService)(objectClass=dhcpGroup)'.
+                    '(objectClass=dhcpSubnet)(objectClass=dhcpSharedNetwork))', array('cn'));
+
+    $nodes = array();
+    while ($attr = $ldap->fetch()) {
+      $subdn = preg_replace('/,'.preg_quote(get_ou('dhcpRDN')).'.+$/', '', $attr['dn']);
+      $parts = ldap_explode_dn($subdn, 1);
+      if ($parts === FALSE) {
+        /* Fallback */
+        $nodes[$attr['dn']] = $subdn;
+      } else {
+        unset($parts['count']);
+        $nodes[$attr['dn']] = implode('>', array_reverse($parts));
+      }
+    }
+    return $nodes;
+  }
+
+  function ldap_save()
+  {
+    global $config;
+
+    $ldap = $config->get_ldap_link();
+    $baseObject = $this->parent->getBaseObject();
+    return $this->attributesAccess['dhcpHosts']->postLdapSave(
+      $ldap,
+      $baseObject->attributeHaveChanged('cn'),
+      $baseObject->attributeHaveChanged('ipHostNumber'),
+      $baseObject->attributeInitialValue('ipHostNumber'),
+      $baseObject->attributeValue('ipHostNumber'),
+      $baseObject->attributeHaveChanged('macAddress'),
+      array($baseObject->attributeInitialValue('macAddress')),
+      array($baseObject->attributeValue('macAddress'))
+    );
+  }
+}
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc b/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
deleted file mode 100644
index 84b609de21..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpAdvanced extends plugin
-{
-  /* Used attributes */
-  var $options= null;
-  var $statements= null;
-  var $show_advanced= FALSE;
-  var $autoStatements= array();
-  var $autoOptions= array();
-
-  /* attribute list for save action */
-  var $attributes= array();
-  var $objectclasses= array();
-  var $parent;
-
-  function __construct()
-  {
-    /* This is always an account */
-    $this->is_account= TRUE;
-    $this->setAutoStatements();
-    $this->setAutoOptions();
-  }
-
-  function execute()
-  {
-  $acl_writeable = preg_match("/w/",$this->parent->getacl(""));
-
-    /* Check for interaction */
-    if ($acl_writeable && isset($_POST['add_statement']) && $_POST['addstatement'] != ""){
-      $key= preg_replace('/^([a-z0-9-]+)\s(.*)$/', '\\1', get_post('addstatement'));
-      $val= preg_replace("/^$key\s*/", '', get_post('addstatement'));
-      $this->statements->add($key,$val);
-    }
-    if ($acl_writeable && isset($_POST['delete_statement']) && isset($_POST['dhcpstatements'])){
-      $name = preg_replace('/_[0-9]*$/', '', get_post('dhcpstatements'));
-      $key  = preg_replace('/^.*_/', '', get_post('dhcpstatements'));
-      if (in_array($name, $this->autoStatements)){
-        msg_dialog::display(_("Error"), _("Cannot delete automatic statements!"), ERROR_DIALOG);
-      } else {
-        $this->statements->remove($name,$key);
-      }
-    }
-    if ($acl_writeable && isset($_POST['add_option']) && $_POST['addoption'] != ""){
-      $key= preg_replace('/^([a-z0-9-]+)\s(.*)$/', '\\1', get_post('addoption'));
-      $val= preg_replace("/^$key\s*/", '', get_post('addoption'));
-      $this->options->add($key,$val);
-    }
-    if ($acl_writeable && isset($_POST['delete_option']) && isset($_POST['dhcpoptions'])){
-      $name = preg_replace('/_[0-9]*$/', '', get_post('dhcpoptions'));
-      $key  = preg_replace('/^.*_/', '', get_post('dhcpoptions'));
-      if (in_array($name, $this->autoOptions)){
-        msg_dialog::display(_("Error"), _("Cannot delete automatic statements!"), ERROR_DIALOG);
-      } else {
-        $this->options->remove($name,$key);
-      }
-    }
-
-    $smarty= get_smarty();
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Assign statements  */
-    $statements= array();
-    foreach ($this->statements->getAll() as $key => $val){
-      if (in_array($key, $this->autoStatements)){
-        foreach($val as $id => $entry){
-          $statements[$key."_".$id]= "$key $entry ["._("automatic")."]";
-        }
-      } else {
-        foreach($val as $id => $entry){
-          $statements[$key."_".$id]= "$key $entry";
-        }
-      }
-    }
-    $smarty->assign("dhcpstatements", $statements);
-
-    /* Assign options  */
-    $options= array();
-    foreach ($this->options->getAll() as $key => $val){
-      if (in_array($key, $this->autoOptions)){
-        foreach($val as $id => $entry){
-          $options[$key."_".$id]= "$key $entry ["._("automatic")."]";
-        }
-      } else {
-        foreach($val as $id => $entry){
-          $options[$key."_".$id]= "$key $entry";
-        }
-      }
-    }
-    $smarty->assign("dhcpoptions", $options);
-
-    /* Show main page */
-    $smarty->assign("show_advanced", $this->show_advanced);
-    return ($smarty->fetch (get_template_path('dhcp_advanced.tpl', TRUE,dirname(__FILE__))));
-  }
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    if (isset($_POST['show_advanced'])){
-      $this->show_advanced= TRUE;
-    }
-    if (isset($_POST['hide_advanced'])){
-      $this->show_advanced= FALSE;
-    }
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    /* Nothing to check here */
-    $message= array();
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-  }
-
-
-  function setAutoOptions($addopt= array())
-  {
-    $options= array("routers", "domain-name", "domain-name-servers", "subnet-mask", "broadcast-address");
-    $this->autoOptions= array_merge($options, $addopt);
-  }
-
-
-  function setAutoStatements($addstat= array())
-  {
-    $statements= array("filename", "next-server", "get-lease-hostnames", "use-host-decl-names");
-    $this->autoStatements= array_merge($statements, $addstat);
-  }
-
-}
-
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpClass.inc b/dhcp/admin/systems/services/dhcp/class_dhcpClass.inc
deleted file mode 100644
index 9a2ef31e0d..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpClass.inc
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpClass extends dhcpPlugin
-{
-  /* attribute list for save action */
-  var $objectclasses= array('top', 'dhcpClass', 'dhcpOptions');
-
-  function __construct($parent,&$attrs)
-  {
-    /* Load statements / options */
-    parent::__construct($parent,$attrs);
-  }
-
-  function execute()
-  {
-    $smarty= get_smarty();
-    $smarty->assign("cn", $this->cn);
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Show main page */
-    $display= $smarty->fetch (get_template_path('dhcp_group.tpl', TRUE,
-      dirname(__FILE__))).$this->network->execute();
-    $display.= $this->advanced->execute();
-
-    /* Add footer */
-    $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-    if(preg_match("/w/",$this->parent->getacl(""))){
-      $display.=   "<input type=submit name='save_dhcp' value='".msgPool::saveButton()."'>&nbsp;";
-    }
-    $display.=   "<input type=submit name='cancel_dhcp' value='".msgPool::cancelButton()."'>";
-    $display.= "</div>";
-
-    return ($display);
-  }
-
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* Save cn */
-    if (preg_match("/w/",$this->parent->getacl("")) && isset($_POST['cn'])){
-      $this->cn= validate(get_post('cn'));
-    }
-
-    /* Handle global saving */
-    parent::save_object();
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message= array();
-
-    $cache = $this->parent->getCache();
-
-    /* All required fields are set? */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("Name"));
-    }
-    if (!preg_match('/^[a-z0-9_-]*$/i', $this->cn)){
-      $message[]= msgPool::invalid(_("Name"),$this->cn,"/[a-z0-9_-]/i");
-    }
-
-    /* cn already used? */
-    if ($this->orig_cn != $this->cn || $this->new){
-
-      foreach($cache as $dn => $dummy){
-        if (preg_match("/^cn=".$this->cn.",/", $dn) && count($dummy)){
-          $message[]= msgPool::duplicated(_("Name"));
-          break;
-        }
-      }
-    }
-
-    /* Check external plugins */
-    $net= $this->network->check();
-    $adv= $this->advanced->check();
-    $message= array_merge($message, $net, $adv);
-
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    parent::save();
-    return ($this->attrs);
-  }
-
-
-}
-
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc b/dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc
deleted file mode 100644
index 9609e16ada..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpDnsZone extends dhcpPlugin
-{
-  /* Used attributes */
-  var $dhcpKeyDN="";
-  var $dhcpDnsZone="";
-  var $dhcpDnsZoneServer="";
-  var $cn="";
-
-  var $drop_down_domain= array();
-  var $drop_down_nameserver= array();
-  var $drop_down_tsigkey= array();
-
-  /* attribute list for save action */
-  var $objectclasses= array("top", "dhcpDnsZone");
-
-
-  function __construct($parent,$attrs,$host_exists_in_gosa = FALSE)
-  {
-    global $config;
-    parent::__construct($parent,$attrs);
-
-    /* Load attributes */
-    if (!$this->new){
-      $this->dhcpDnsZoneServer= $attrs['dhcpDnsZoneServer'][0];
-      $this->dhcpKeyDN= base64_encode($attrs['dhcpKeyDN'][0]);
-    }
-
-    // Prepare LDAP link
-    $ldap= $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-
-    /* Search for all objects, recursive, that match the given ldap filter.
-       each dyndns zoen have to depent of an alreday DNS Zone created so we search it
-     */
-
-    // Search for domain
-    $ldap->search("(&(objectClass=dNSZone)(relativeDomainName=@))",array("zoneName"));
-    while($attrs = $ldap->fetch()){
-      $this->drop_down_domain[$attrs["zoneName"][0]]= $attrs["zoneName"][0];
-    }
-
-    $ldap->search("(&(objectClass=dNSZone)(relativeDomainName=@))",array("nSRecord"));
-    while($attrs = $ldap->fetch()){
-      $this->drop_down_nameserver[$attrs["nSRecord"][0]]=$attrs["nSRecord"][0];
-    }
-
-    $ldap->search("(objectClass=dhcpTSigKey)",array("dn","cn"));
-    if ($ldap->count() != 0){
-      while($attrs = $ldap->fetch()){
-        $this->drop_down_tsigkey[base64_encode($attrs["dn"])]=$attrs["cn"][0];
-      }
-    }
-  }
-
-
-  function execute()
-  {
-    $smarty= get_smarty();
-    $smarty->assign("cn", $this->cn);
-    $smarty->assign("cns",$this->drop_down_domain);
-
-    $smarty->assign("dhcpDnsZoneServer", $this->dhcpDnsZoneServer);
-    $smarty->assign("dhcpDnsZoneServers",$this->drop_down_nameserver);
-
-    $smarty->assign("dhcpKeyDN", $this->dhcpKeyDN);
-    $smarty->assign("dhcpKeyDNs",$this->drop_down_tsigkey);
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Show main page */
-    $display= $smarty->fetch(get_template_path('dhcp_dnszone.tpl', TRUE,dirname(__FILE__)));
-
-    /* Add footer */
-    $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-    if(preg_match("/w/",$this->parent->getacl(""))){
-        $display.=   "<input type=submit name='save_dhcp' value='".msgPool::saveButton()."'>&nbsp;";
-    }
-    $display.=   "<input type=submit name='cancel_dhcp' value='".msgPool::cancelButton()."'>";
-    $display.= "</div>";
-
-    return ($display);
-  }
-
-
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* Save remaining attributes */
-    if (isset($_POST['dhcp_dnszone_posted']) && preg_match("/w/", $this->parent->getacl(""))){
-
-      if (isset($_POST['dhcpKeyDN'])){
-        $this->dhcpKeyDN= get_post('dhcpKeyDN');
-      }
-
-      if (isset($_POST['dhcpDnsZoneServer'])){
-        $this->dhcpDnsZoneServer= get_post('dhcpDnsZoneServer');
-      }
-      if (isset($_POST['cn'])){
-        $this->cn= get_post('cn');
-      }
-
-    }
-
-    parent::save_object();
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message= array();
-
-    /* All required fields are set? */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("DNS zone"));
-    }
-
-    if ($this->dhcpDnsZoneServer == ""){
-      $message[]= msgPool::required(_("DNS server"));
-    }
-
-    if ($this->dhcpKeyDN == ""){
-      $message[]= msgPool::required(_("Key DN"));
-    }
-
-
-    /* cn already used? */
-    if (($this->orig_cn != $this->cn) || $this->new) {
-      $cache = array();
-      if (isset($this->parent) && method_exists($this->parent, 'getCache')) {
-        $cache = $this->parent->getCache();
-      }
-      foreach ($cache as $dn => $dummy) {
-        if (preg_match('/^cn='.$this->cn.',/', $dn) && count($dummy)) {
-          $message[] = msgPool::duplicated(_('Name'));
-          break;
-        }
-      }
-    }
-
-    /* Check external plugins */
-    $net= $this->network->check();
-    $adv= $this->advanced->check();
-    $message= array_merge($message, $net, $adv);
-
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    parent::save();
-
-    if ($this->dhcpKeyDN != ""){
-      $this->attrs['dhcpKeyDN']= array(base64_decode($this->dhcpKeyDN));
-    } else {
-      $this->attrs['dhcpKeyDN']= array();
-    }
-
-    if ($this->dhcpDnsZoneServer != ""){
-      $this->attrs['dhcpDnsZoneServer']= array($this->dhcpDnsZoneServer);
-    } else {
-      $this->attrs['dhcpDnsZoneServer']= array();
-    }
-
-    return ($this->attrs);
-  }
-
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc b/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc
deleted file mode 100644
index 2e55b46397..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpGroup extends dhcpPlugin
-{
-  /* attribute list for save action */
-  var $objectclasses= array('top', 'dhcpGroup', 'dhcpOptions');
-
-  function __construct($parent,&$attrs)
-  {
-    /* Load statements / options */
-    parent::__construct($parent,$attrs);
-  }
-
-  function execute()
-  {
-    $smarty= get_smarty();
-    $smarty->assign("cn", $this->cn);
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Show main page */
-    $display= $smarty->fetch (get_template_path('dhcp_group.tpl', TRUE,
-      dirname(__FILE__))).$this->network->execute();
-    $display.= $this->advanced->execute();
-
-    /* Add footer */
-    $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-    if(preg_match("/w/",$this->parent->getacl(""))){
-      $display.=   "<input type=submit name='save_dhcp' value='".msgPool::saveButton()."'>&nbsp;";
-    }
-    $display.=   "<input type=submit name='cancel_dhcp' value='".msgPool::cancelButton()."'>";
-    $display.= "</div>";
-
-    return ($display);
-  }
-
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* Save cn */
-    if (preg_match("/w/",$this->parent->getacl("")) && isset($_POST['cn'])){
-      $this->cn= validate(get_post('cn'));
-    }
-
-    /* Handle global saving */
-    parent::save_object();
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message= array();
-
-    $cache = $this->parent->getCache();
-
-    /* All required fields are set? */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("Name"));
-    }
-    if (!preg_match('/^[a-z0-9_-]*$/i', $this->cn)){
-      $message[]= msgPool::invalid(_("Name"),$this->cn,"/[a-z0-9_-]/i");
-    }
-
-    /* cn already used? */
-    if ($this->orig_cn != $this->cn || $this->new){
-
-      foreach($cache as $dn => $dummy){
-        if (preg_match("/^cn=".$this->cn.",/", $dn) && count($dummy)){
-          $message[]= msgPool::duplicated(_("Name"));
-          break;
-        }
-      }
-    }
-
-    /* Check external plugins */
-    $net= $this->network->check();
-    $adv= $this->advanced->check();
-    $message= array_merge($message, $net, $adv);
-
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    parent::save();
-    return ($this->attrs);
-  }
-
-
-}
-
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc b/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc
deleted file mode 100644
index df6cd5d65a..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpHost extends dhcpPlugin
-{
-  /* Used attributes */
-  var $dhcpHWAddress= "";
-  var $realGosaHost = FALSE;
-
-  /* attribute list for save action */
-  var $objectclasses= array("top", "dhcpHost");
-
-  function __construct($parent,$attrs,$host_exists_in_gosa = FALSE)
-  {
-    parent::__construct($parent,$attrs);
-
-    /* Load attributes */
-    if (!$this->new){
-      $this->dhcpHWAddress= $attrs['dhcpHWAddress'][0];
-    }
-
-    $this->advanced->setAutoOptions(array("host-name"));
-    $this->advanced->setAutoStatements(array("fixed-address"));
-
-    $this->realGosaHost = $host_exists_in_gosa;
-  }
-
-  function execute()
-  {
-    $smarty= get_smarty();
-    $smarty->assign("cn", $this->cn);
-    $smarty->assign("dhcpHWAddress", preg_replace('/^[^ ]+ /', '', $this->dhcpHWAddress));
-    $smarty->assign("realGosaHost",$this->realGosaHost);
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Create fixed address */
-    $smarty->assign("fixedaddr", $this->statements->get('fixed-address'));
-
-    /* Prepare hw type selector */
-    $hwtype= preg_replace('/\s.*$/', '', $this->dhcpHWAddress);
-    $smarty->assign("hwtype", $hwtype);
-    $smarty->assign("hwtypes", array("ethernet" => _("Ethernet"),
-          "fddi" => _("FDDI"),
-          "token-ring" => _("Token Ring")));
-    /* Show main page */
-    $display= $smarty->fetch(get_template_path('dhcp_host.tpl', TRUE,dirname(__FILE__))).$this->network->execute();
-
-    /* Get advanced options */
-    $display.= $this->advanced->execute();
-
-    /* Add footer */
-    $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-#    if(preg_match("/w/",$this->parent->getacl(""))){
-        $display.=   "<input type=submit name='save_dhcp' value='".msgPool::saveButton()."'>&nbsp;";
-#    }
-    $display.=   "<input type=submit name='cancel_dhcp' value='".msgPool::cancelButton()."'>";
-    $display.= "</div>";
-
-    return ($display);
-  }
-
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* Save remaining attributes */
-    if (isset($_POST['dhcp_host_posted']) && preg_match("/w/",$this->parent->getacl(""))){
-
-      /* Assemble hwAddress */
-      if (isset($_POST['dhcpHWAddress'])){
-        $this->dhcpHWAddress= get_post('hwtype')." ".get_post('dhcpHWAddress');
-      }
-
-      if(!$this->realGosaHost){
-        $this->cn= validate(get_post('cn'));
-      }
-
-      /* Save fixed address */
-      if(!$this->realGosaHost){
-        if ($_POST['fixedaddr'] != ""){
-          $this->statements->set('fixed-address', get_post('fixedaddr'));
-        } else {
-          $this->statements->removeAll('fixed-address');
-        }
-      }
-      $this->options->set('host-name',$this->cn);
-    }
-
-    parent::save_object();
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message = array();
-
-    /* All required fields are set? */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("Name"));
-    }
-
-    /* cn already used? */
-    if (($this->orig_cn != $this->cn) || $this->new) {
-      $cache = array();
-      if (isset($this->parent) && method_exists($this->parent, 'getCache')) {
-        $cache = $this->parent->getCache();
-      }
-      foreach ($cache as $dn => $dummy) {
-        if (preg_match('/^cn='.$this->cn.',/', $dn) && count($dummy)) {
-          $message[] = msgPool::duplicated(_('Name'));
-          break;
-        }
-      }
-    }
-
-    /* Check syntax of MAC address */
-    $check= preg_replace('/^[^\s]*\s/', '', $this->dhcpHWAddress);
-    if (!preg_match('/^([0-9a-fA-F]{1,2}:){5}[0-9a-fA-F]{1,2}$/', $check)){
-      $message[]= msgPool::invalid(_("Hardware address"));
-    }
-
-    /* Check external plugins */
-    $net= $this->network->check();
-    $adv= $this->advanced->check();
-    $message= array_merge($message, $net, $adv);
-
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    parent::save();
-    if ($this->dhcpHWAddress != ""){
-      $this->attrs['dhcpHWAddress']= array($this->dhcpHWAddress);
-    } else {
-      $this->attrs['dhcpHWAddress']= array();
-    }
-
-    return ($this->attrs);
-  }
-
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc b/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc
deleted file mode 100644
index b876fb6f89..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpNetwork extends plugin
-{
-  /* Used attributes */
-  var $options= null;
-  var $statements= null;
-
-  /* attribute list for save action */
-  var $attributes= array();
-  var $objectclasses= array();
-
-  function __construct()
-  {
-    /* This is always an account */
-    $this->is_account= TRUE;
-  }
-
-  function execute()
-  {
-
-    $acl_writeable = preg_match("/w/",$this->parent->getacl(""));
-
-    /* Check for iteraction */
-    if ($acl_writeable && isset($_POST['add_dns']) && $_POST['addserver'] != ""){
-      if (!preg_match('/^[0-9a-z.-]+$/', get_post('addserver'))){
-        msg_dialog::display(_("Error"), msgPool::invalid(_("Name"),
-              htmlentities(get_post('addserver')),"/[0-9a-z.-]/"), ERROR_DIALOG);
-      } else {
-        $servers= array();
-        if($this->options->exists('domain-name-servers')){
-          foreach(explode(",", $this->options->get('domain-name-servers')) as $val){
-            $servers[$val]= $val;
-          }
-        }
-        $servers[get_post('addserver')]= get_post('addserver');
-
-        $tmp= "";
-        foreach($servers as $val){
-          $tmp.= $val.",";
-        }
-        $this->options->removeAll('domain-name-servers');
-        $this->options->set('domain-name-servers',preg_replace('/,$/', '', $tmp));
-      }
-    }
-
-    if ($acl_writeable && isset($_POST['delete_dns']) && isset($_POST['dnsserver'])){
-      $tmp= preg_replace("/(\s*,\s*)?".get_post('dnsserver')."/i", '',
-        $this->options->get('domain-name-servers'));
-      $tmp= trim(preg_replace("/(\s*)?,(\s*)?$/", '', $tmp),",");
-
-
-
-      if ($tmp != ""){
-        $this->options->set('domain-name-servers', $tmp);
-      } else {
-        $this->options->remove('domain-name-servers');
-      }
-    }
-
-    /* Show main page */
-    $smarty= get_smarty();
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /*
-     * Assemble options
-     */
-
-    /* Router */
-    $smarty->assign("routers", $this->options->get('routers'));
-
-    /* DNS */
-    $smarty->assign("domain",$this->options->get('domain-name'));
-
-    if($this->options->exists('domain-name-servers')){
-      $servers= array();
-      foreach(explode(",", $this->options->get('domain-name-servers')) as $val){
-        $servers[$val]= $val;
-      }
-      $smarty->assign("dnsservers", $servers);
-    } else {
-      $smarty->assign("dnsservers", "");
-    }
-
-    /* Netmask / Broadcast */
-    if ($this->options->exists('subnet-mask')){
-      $this->options->set('subnet-mask',normalize_netmask($this->options->get('subnet-mask')));
-    }
-    $smarty->assign("subnet_mask", $this->options->get('subnet-mask'));
-    $smarty->assign("broadcast_address", $this->options->get('broadcast-address'));
-
-    /* Boot stuff */
-    $smarty->assign("filename", $this->statements->get('filename'));
-    $smarty->assign("nextserver", $this->statements->get('next-server'));
-
-    /* Set flags */
-    $smarty->assign("autohost", "");
-    if ($this->statements->exists('get-lease-hostnames')){
-      if (preg_match('/^(true|on|yes)$/', $this->statements->get('get-lease-hostnames'))){
-        $smarty->assign("autohost", "checked");
-      }
-    }
-    $smarty->assign("autohostdecl", "");
-    if ($this->statements->exists('use-host-decl-names')){
-      if (preg_match('/^(true|on|yes)$/', $this->statements->get('use-host-decl-names'))){
-        $smarty->assign("autohostdecl", "checked");
-      }
-    }
-
-    return $smarty->fetch(get_template_path('dhcp_network.tpl', TRUE,dirname(__FILE__)));
-  }
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* Only save, if we are "active" */
-    if (isset($_POST['routers']) && preg_match("/w/",$this->parent->getacl(""))){
-
-      /*
-       * Assemble options
-       */
-
-      /* Options */
-      foreach (array("routers" => "routers", "domain-name" => "domain", "subnet-mask" => "subnet_mask",
-                     "broadcast-address" => "broadcast_address") as $key => $val){
-        if ($_POST["$val"] == ''){
-          $this->options->remove($key);
-        } else {
-          $this->options->set($key,get_post($val));
-        }
-      }
-
-      /* Statements */
-      foreach (array("filename" => "filename", "next-server" => "nextserver") as $key => $val){
-        if ($_POST["$val"] == ''){
-          $this->statements->removeAll($key);
-        } else {
-
-          /* Only quote filename values */
-          if(in_array($key,array("filename"))){
-            $this->statements->set($key,'"'.trim(get_post($val),"\"").'"');
-          }else{
-            $this->statements->set($key,get_post($val));
-          }
-        }
-      }
-
-      /* Flags */
-      if (isset ($_POST['autohost'])){
-        $this->statements->set('get-lease-hostnames',"true");
-      } else {
-        $this->statements->removeAll('get-lease-hostnames');
-      }
-      if (isset ($_POST['autohostdecl'])){
-        $this->statements->set('use-host-decl-names', "on");
-      } else {
-        $this->statements->removeAll('use-host-decl-names');
-      }
-    }
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message= array();
-
-    /* Check netmask and broadcast */
-    foreach(array("subnet-mask" => _("Netmask"), "broadcast-address" => _("Broadcast")) as $key => $typ){
-      if (!$this->options->exists("$key")){
-        continue;
-      }
-      if (!tests::is_ip($this->options->get($key))){
-        $message[]= sprintf(_("Error in definition of '%s'!"), $typ);
-      }
-    }
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-  }
-
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpOption.inc b/dhcp/admin/systems/services/dhcp/class_dhcpOption.inc
deleted file mode 100644
index b1849eae26..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpOption.inc
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-  /* This class represents a set of dhcpOptions, which are used over several dhcp plugins.
-   * E.g. 'dhcpHost' includes 'dhcpAdvanced', both use the same options.
-   * In other words, they use a references to an instance of this class.
-   */
-class dhcpOption{
-
-  var $options = array();
-
-  function getAll(){
-    return($this->options);
-  }
-
-  function get($name){
-    if(isset($this->options[$name])){
-      if(count($this->options[$name]) == 0){
-        return("");
-      }elseif(count($this->options[$name]) == 1){
-        return($this->options[$name][0]);
-      }else{
-        return($this->options[$name]);
-      }
-    }
-  }
-
-  function removeAll($name){
-    if(isset($this->options[$name])){
-      unset($this->options[$name]);
-    }
-  }
-
-  function remove($name,$entry = 0){
-    if(!isset($this->options[$name])){
-      return;
-    }
-    if(isset($this->options[$name][$entry])){
-      unset($this->options[$name][$entry]);
-    }
-    if(count($this->options[$name]) == 0){
-      unset($this->options[$name]);
-    }else{
-      $this->options[$name] = array_unique($this->options[$name]);
-      $this->options[$name] = array_values($this->options[$name]);
-    }
-  }
-
-  function set($name,$value = null){
-    if($value == null){
-      $value = trim(preg_replace("/^[^ ]*/",'',$name));
-      $name  = trim(preg_replace("/ .*$/",'',$name));
-    }
-
-    if(!isset($this->options[$name])){
-      $this->options[$name] = array();
-    }
-
-    $this->options[$name] = array($value);
-  }
-
-  function add($name,$value = null){
-    if($value == null){
-      $value = trim(preg_replace("/^[^ ]*/",'',$name));
-      $name  = trim(preg_replace("/ .*$/",'',$name));
-    }
-
-    if(!isset($this->options[$name])){
-      $this->options[$name] = array();
-    }
-
-    $this->options[$name][] = $value;
-    $this->options[$name] = array_unique($this->options[$name]);
-    $this->options[$name] = array_values($this->options[$name]);
-  }
-
-  function save(){
-    $res = array();
-    foreach($this->options as $key => $values){
-      foreach($values as $value){
-        $res[] = $key." ".$value;
-      }
-    }
-    $res=array_unique($res);
-    return($res);
-  }
-
-  function exists($name){
-    if(isset($this->options[$name]) && count($this->options[$name]) == 0){
-      return(false);
-    }
-    return(isset($this->options[$name]));
-  }
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc b/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc
deleted file mode 100644
index 94b86cd755..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpPlugin extends plugin
-{
-  /* Used attributes */
-  var $cn= "";
-  var $orig_cn= "";
-  var $options= null;
-  var $statements= array();
-
-  /* Subobjects */
-  var $network;
-  var $advanced;
-
-  /* attribute list for save action */
-  var $attributes= array();
-  var $objectclasses= array();
-
-  function __construct(&$parent,$attrs)
-  {
-    $this->parent = $parent;
-
-    $this->options = new dhcpOption();
-    $this->statements = new dhcpOption();
-
-    /* Load statements / options */
-    if (is_array($attrs)){
-      $this->dn= $attrs['dn'];
-      $this->cn= $attrs['cn'][0];
-      $this->new= FALSE;
-
-      /* Load options */
-      if (isset($attrs['dhcpOption'])){
-        foreach($attrs['dhcpOption'] as $opt){
-          $this->options->add(trim($opt));
-        }
-      }
-
-      /* Load statements */
-      if (isset($attrs['dhcpStatements'])){
-        foreach($attrs['dhcpStatements'] as $opt){
-          $this->statements->add(trim($opt));
-        }
-      }
-    } else {
-      /* We keep the parent dn here if it's new */
-      $this->dn= $attrs;
-      $this->new= TRUE;
-    }
-
-    /* Load network module */
-    $this->network= new dhcpNetwork();
-    $this->network->options= &$this->options;
-    $this->network->statements= &$this->statements;
-    $this->advanced= new dhcpAdvanced();
-    $this->advanced->options= &$this->options;
-    $this->advanced->statements= &$this->statements;
-
-    $this->network->parent = $parent;
-    $this->advanced->parent = $parent;
-
-    /* Save CN for later reference */
-    $this->orig_cn= $this->cn;
-  }
-
-  function execute()
-  {
-    return ("");
-  }
-
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
- # // CHECK
- #   foreach (array("filename", "next-server","get-lease-hostnames","use-host-decl-names") as $toberemoved){
- #     unset($this->statements[$toberemoved]);
- #   }
-
-    /* Save sub-objects */
-    $this->network->save_object();
-    $this->advanced->save_object();
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message= array();
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    /* Add cn if we're new */
-    if ($this->new){
-      $this->dn= "cn=".$this->cn.",".$this->dn;
-    } else {
-      $this->dn= "cn=".$this->cn.preg_replace('/^cn=[^,]+/', '', $this->dn);
-    }
-
-    /* Assemble new entry - options */
-    $this->attrs['dhcpOption']= $this->options->save();
-
-    /* Assemble new entry - statements */
-    $this->attrs['dhcpStatements']= $this->statements->save();
-
-    /* Move dn to the result */
-    $this->attrs['dn']= $this->dn;
-    $this->attrs['cn']= array($this->cn);
-    $this->attrs['objectClass']= $this->objectclasses;
-    $this->attrs['MODIFIED']= TRUE;
-    return ($this->attrs);
-  }
-
-
-  function removeAttrs($name, $type)
-  {
-    $new= array();
-    foreach ($this->attrs[$type] as $value){
-      if (!preg_match("/^$name /", $value)){
-        $new[]= $value;
-      }
-    }
-    $this->attrs[$type]= $new;
-  }
-
-
-  function removeOption($name)
-  {
-    $this->removeAttrs($name, 'dhcpOption');
-  }
-
-
-  function removeStatement($name)
-  {
-    $this->removeAttrs($name, 'dhcpStatement');
-  }
-
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc b/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc
deleted file mode 100644
index e9df9566ce..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpPool extends dhcpPlugin
-{
-  /* Used attributes */
-  var $dhcpRange= "";
-  var $range_start= "";
-  var $range_stop= "";
-
-  /* attribute list for save action */
-  var $objectclasses= array('top', 'dhcpPool');
-
-  function __construct($parent,$attrs)
-  {
-    parent::__construct($parent,$attrs);
-
-    /* Load attributes */
-    if (!$this->new){
-      $this->dhcpRange= $attrs['dhcpRange'][0];
-      list($this->range_start, $this->range_stop)= preg_split('/\s+/', $this->dhcpRange);
-    }
-
-    $this->advanced->setAutoOptions(array("host-name"));
-    $this->advanced->setAutoStatements(array("fixed-address"));
-  }
-
-  function execute()
-  {
-    $smarty= get_smarty();
-    $smarty->assign("cn", $this->cn);
-    $smarty->assign("range_start", $this->range_start);
-    $smarty->assign("range_stop", $this->range_stop);
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Show main page */
-    $display= $smarty->fetch(get_template_path('dhcp_pool.tpl', TRUE, dirname(__FILE__))).$this->network->execute();
-
-    $display.= $this->advanced->execute();
-
-    /* Add footer */
-    $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-    if(preg_match("/w/",$this->parent->getacl(""))){
-        $display.=   "<input type=submit name='save_dhcp' value='".msgPool::saveButton()."'>&nbsp;";
-    }
-    $display.=   "<input type=submit name='cancel_dhcp' value='".msgPool::cancelButton()."'>";
-    $display.= "</div>";
-
-    return ($display);
-  }
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    if (isset($_POST['cn'])){
-      $this->cn= validate(get_post('cn'));
-      $this->range_start= validate(get_post('range_start'));
-      $this->range_stop= validate(get_post('range_stop'));
-    }
-
-    parent::save_object();
-
-    /* Move range to internal variable */
-    $this->dhcpRange= $this->range_start." ".$this->range_stop;
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message= array();
-
-    $cache = $this->parent->getCache();
-
-    /* All required fields are set? */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("Name"));
-    }
-
-    /* cn already used? */
-    if ($this->orig_cn != $this->cn || $this->new){
-
-      foreach($cache as $dn => $dummy){
-        if (preg_match("/^cn=".$this->cn.",/", $dn) && count($dummy)){
-          $message[]= msgPool::duplicated(_("Name"));
-          break;
-        }
-      }
-    }
-
-    if ($this->dhcpRange == ""){
-      $message[]= msgPool::required(_("Range"));
-    }
-
-    if (!tests::is_ip($this->range_start) || !tests::is_ip($this->range_stop)){
-      $message[]= msgPool::invalid(_("Range"));
-    }
-
-    if(!tests::is_ip_range($this->range_start,$this->range_stop)){
-      $message[]= msgPool::invalid(_("Range"));
-    }
-
-    /* Check if range is in the network */
-    $dn= $this->dn;
-    while (preg_match('/,/', $dn)){
-      $type= $this->objectType($cache, $dn);
-
-      /* Check for subnet */
-      if ($type == 'dhcpSubnet'){
-        $network= $cache[$dn]['cn'][0];
-        $netmask= normalize_netmask($cache[$dn]['dhcpNetMask'][0]);
-        if (!tests::is_in_network($network, $netmask, $this->range_start) ||
-            !tests::is_in_network($network, $netmask, $this->range_stop)){
-          $message[] = _("'Range' is not inside the configured network.");
-        }
-      }
-
-      /* Stop if we've examined the service base object */
-      if ($type == 'dhcpService'){
-        break;
-      }
-      $dn= preg_replace('/^[^,]+,/', '', $dn);
-    }
-
-    /* Check external plugins */
-    $net= $this->network->check();
-    $adv= $this->advanced->check();
-    $message= array_merge($message, $net, $adv);
-
-    return $message;
-  }
-
-  /* Save to LDAP */
-  function save()
-  {
-    parent::save();
-    $this->attrs['dhcpRange']= array($this->dhcpRange);
-
-    return ($this->attrs);
-  }
-
-
-  function objectType($cache, $dn)
-  {
-    $type= "";
-    $types= array("dhcpService", "dhcpClass", "dhcpSubClass", "dhcpHost",
-                  "dhcpGroup", "dhcpPool", "dhcpSubnet", "dhcpSharedNetwork");
-
-    foreach ($cache[$dn]['objectClass'] as $oc){
-      if (in_array($oc, $types)){
-        $type= $oc;
-        break;
-      }
-    }
-
-    return ($type);
-  }
-
-
-}
-
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpService.inc b/dhcp/admin/systems/services/dhcp/class_dhcpService.inc
deleted file mode 100644
index 67cea39a5b..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpService.inc
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-class dhcpService extends dhcpPlugin
-{
-  /* Used attributes */
-  var $dhcpPrimaryDN      = "";
-  var $orig_dhcpPrimaryDN = "";
-  var $ddns_styles        = array('none', 'interim', 'ad-hoc');
-
-  /* attribute list for save action */
-  var $objectclasses = array('top', 'dhcpService');
-
-
-  function __construct($parent, $attrs)
-  {
-    parent::__construct($parent, $attrs);
-
-    /* Load statements / options */
-    if (!$this->new) {
-      /* Load attributes */
-      $this->dhcpPrimaryDN = $attrs['dhcpPrimaryDN'][0];
-    } else {
-      /* We keep the parent dn here if it's new */
-      $this->statements->set('default-lease-time', 600);
-      $this->statements->set('max-lease-time', 1700);
-      $this->statements->set('authoritative', TRUE);
-      $this->statements->set('ddns-update-style', 'none');
-    }
-
-    $this->advanced->setAutoOptions(array("server-name"));
-    $this->advanced->setAutoStatements(array("default-lease-time", "max-lease-time",
-          "authoritative", "server-identifier", "ddns-update-style"));
-
-    /* Save for later action */
-    $this->orig_dhcpPrimaryDN = $this->dhcpPrimaryDN;
-  }
-
-
-  function execute()
-  {
-    /* Show main page */
-    $smarty = get_smarty();
-
-    /* Assign ACLs */
-    $smarty->assign("acl", $this->parent->getacl(""));
-
-    $smarty->assign('ddns_styles', $this->ddns_styles);
-    foreach (array('max_lease_time', 'default_lease_time', 'ddns_update_style') as $value) {
-      $smarty->assign("$value", $this->statements->get(preg_replace('/_/', '-', $value)));
-    }
-
-    $smarty->assign("authoritative", $this->statements->exists('authoritative'));
-
-    /* Show main page */
-    $display = $smarty->fetch(get_template_path('dhcp_service.tpl', TRUE, dirname(__FILE__))).$this->network->execute();
-
-    $display .= $this->advanced->execute();
-
-    /* Add footer */
-    $display .= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-    if (preg_match("/w/", $this->parent->getacl(""))) {
-        $display .= "<input type=submit name='save_dhcp' value='".msgPool::saveButton()."'>&nbsp;";
-    }
-    $display .= "<input type=submit name='cancel_dhcp' value='".msgPool::cancelButton()."'>";
-    $display .= "</div>";
-
-    return $display;
-
-  }
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* No need to save in the first time */
-    if (isset($_POST['ddns_update_style']) && preg_match("/w/", $this->parent->getacl(""))) {
-
-      /* Save remaining attributes */
-      foreach (array('max_lease_time', 'default_lease_time', 'ddns_update_style') as $val) {
-        $tval = preg_replace('/_/', '-', $val);
-        if ($_POST[$val] != "") {
-          $this->statements->set($tval, validate(get_post($val)));
-        } else {
-          $this->statements->removeAll($tval);
-        }
-      }
-      if (isset($_POST['authoritative'])) {
-        $this->statements->set('authoritative', "");
-      } else {
-        $this->statements->removeAll('authoritative');
-      }
-    }
-
-    parent::save_object();
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message = array();
-
-    if (!tests::is_id($this->statements->get('default-lease-time'))) {
-      $message[] = msgPool::invalid(_("Lease time"), $this->statements->get('default-lease-time'), "/[0-9]/");
-    }
-    if (!tests::is_id($this->statements->get('max-lease-time'))) {
-      $message[] = msgPool::invalid(_("Max lease time"), $this->statements->get('max-lease-time'), "/[0-9]/");
-    }
-    if ($this->statements->get('default-lease-time') > $this->statements->get('max-lease-time')) {
-      $message[] = msgPool::toobig(_("Default lease time"), _("Maximum lease time"));
-    }
-
-    /* Check external plugins */
-    $net = $this->network->check();
-    $adv = $this->advanced->check();
-    $message = array_merge($message, $net, $adv);
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    global $config;
-    $this->attrs = array();
-
-    /* Get and set server name */
-    $ldap = $config->get_ldap_link();
-    $ldap->cat($this->dhcpPrimaryDN, array('cn'));
-    $res = $ldap->fetch();
-    if (isset($res['cn'][0])) {
-      $server_name = $res['cn'][0];
-    }
-
-    parent::save();
-
-    $this->attrs['dhcpPrimaryDN'] = array($this->dhcpPrimaryDN);
-    $this->removeOption('server-name');
-    //~ $this->attrs['dhcpOption'][] = "server-name $server_name";
-
-    return ($this->attrs);
-  }
-
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc b/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc
deleted file mode 100644
index 7a5dadffb6..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpSharedNetwork extends dhcpPlugin
-{
-  /* attribute list for save action */
-  var $objectclasses= array('top', 'dhcpSharedNetwork');
-
-  function __construct($parent,$attrs)
-  {
-    parent::__construct($parent,$attrs);
-
-    $this->advanced->setAutoStatements(array("server-identifier", "default-lease-time",
-          "max-lease-time", "min-lease-time", "authoritative", "deny unknown-clients",
-          "deny bootp", "deny booting", "allow unknown-clients",
-          "allow bootp", "allow booting"));
-  }
-
-
-  function execute()
-  {
-    $smarty= get_smarty();
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Fill template */
-    $smarty->assign ("cn", $this->cn);
-    foreach (array("server-identifier", "default-lease-time", "max-lease-time", "min-lease-time") as $attr){
-      $name = preg_replace('/-/', '_', $attr);
-      $smarty->assign($name, $this->statements->get($attr));
-    }
-    if ($this->statements->exists("authoritative")){
-      $smarty->assign("authoritative", "checked");
-    } else {
-      $smarty->assign("authoritative", "");
-    }
-
-    $allow = $this->statements->get("allow");
-    if(!is_array($allow)) $allow=array($allow);
-    foreach(array(
-          "unknown-clients" => "allow_unknown_state",
-          "bootp" => "allow_bootp_state",
-          "booting" => "allow_booting_state") as $state => $target){
-      if(in_array($state,$allow)){
-        $smarty->assign($target,"checked");
-      }else{
-        $smarty->assign($target,"");
-      }
-    }
-
-    /* Show main page */
-    $display= $smarty->fetch(get_template_path('dhcp_sharedNetwork.tpl', TRUE,dirname(__FILE__))).$this->network->execute();
-
-    /* Remove states configured by checkboxes.
-     */
-    foreach(array("deny unknown-clients",
-          "deny bootp", "deny booting", "allow unknown-clients",
-          "allow bootp", "allow booting") as $name){
-      if($this->statements->exists($name)){
-        $this->statements->remove($name);
-      }
-    }
-
-    $display.= $this->advanced->execute();
-
-    /* Add footer */
-    $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-    if(preg_match("/w/",$this->parent->getacl(""))){
-        $display.=   "<input type=submit name='save_dhcp' value='".msgPool::saveButton()."'>&nbsp;";
-    }
-    $display.=   "<input type=submit name='cancel_dhcp' value='".msgPool::cancelButton()."'>";
-    $display.= "</div>";
-
-    return ($display);
-  }
-
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* Check permissions, don't touch anything if we do not have write permissions */
-    if (!preg_match("/w/", $this->parent->getacl(""))) {
-      parent::save_object();
-    } elseif(isset($_POST['cn'])) {
-
-      $this->cn = validate(get_post('cn'));
-      parent::save_object();
-
-      foreach (array("server-identifier", "default-lease-time",
-            "max-lease-time", "min-lease-time") as $attr){
-        if (isset($_POST[$attr]) && $_POST[$attr] != ""){
-          $this->statements->set($attr,get_post($attr));
-        } else {
-          $this->statements->removeAll($attr);
-        }
-      }
-
-      if (isset($_POST["authoritative"])){
-        $this->statements->set("authoritative", "");
-      } else {
-        $this->statements->removeAll("authoritative");
-      }
-
-      $this->statements->removeAll("deny");
-      $this->statements->removeAll("allow");
-      foreach(array("unknown-clients", "bootp", "booting") as $name){
-        if (isset($_POST[$name])){
-          $this->statements->add("allow",$name);
-        } else {
-          $this->statements->add("deny",$name);
-        }
-      }
-    }
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message= array();
-
-    $cache = $this->parent->getCache();
-
-    /* All required fields are set? */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("Name"));
-    }
-
-    /* Check lease times */
-    foreach (array("default-lease-time" => _("Default lease time"),
-          "max-lease-time" => _("Max. lease time"),
-          "min-lease-time" => _("Min. lease time")) as $key => $val){
-      if ($this->statements->exists($key) && $this->statements->get($key) != "" &&
-          !tests::is_id($this->statements->get($key))){
-        $message[]= msgPool::invalid($val,$this->statements->get($key),"/[0-9]/");
-      }
-    }
-
-    /* cn already used? */
-    if ($this->orig_cn != $this->cn || $this->new){
-
-      foreach($cache as $dn => $dummy){
-        if (preg_match("/^cn=".$this->cn.",/", $dn) && count($dummy)){
-          $message[]= msgPool::duplicated(_("Name"));
-          break;
-        }
-      }
-    }
-
-    /* Check external plugins */
-    $net= $this->network->check();
-    $adv= $this->advanced->check();
-    $message= array_merge($message, $net, $adv);
-
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    parent::save();
-
-    return ($this->attrs);
-  }
-
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc b/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc
deleted file mode 100644
index 4253b89cc0..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-class dhcpSubClass extends dhcpPlugin
-{
-  /* attribute list for save action */
-  var $objectclasses= array('top', 'dhcpSubClass', 'dhcpOptions');
-
-  function __construct($parent,&$attrs)
-  {
-    /* Load statements / options */
-    parent::__construct($parent,$attrs);
-  }
-
-  function execute()
-  {
-    $smarty= get_smarty();
-    $smarty->assign("cn", $this->cn);
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Show main page */
-    $display= $smarty->fetch (get_template_path('dhcp_group.tpl', TRUE,
-      dirname(__FILE__))).$this->network->execute();
-    $display.= $this->advanced->execute();
-
-    /* Add footer */
-    $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-    if(preg_match("/w/",$this->parent->getacl(""))){
-      $display.=   "<input type=submit name='save_dhcp' value='".msgPool::saveButton()."'>&nbsp;";
-    }
-    $display.=   "<input type=submit name='cancel_dhcp' value='".msgPool::cancelButton()."'>";
-    $display.= "</div>";
-
-    return ($display);
-  }
-
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* Save cn */
-    if (preg_match("/w/",$this->parent->getacl("")) && isset($_POST['cn'])){
-      $this->cn= validate(get_post('cn'));
-    }
-
-    /* Handle global saving */
-    parent::save_object();
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message= array();
-
-    $cache = $this->parent->getCache();
-
-    /* All required fields are set? */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("Name"));
-    }
-    if (!preg_match('/^[a-z0-9_-]*$/i', $this->cn)){
-      $message[]= msgPool::invalid(_("Name"),$this->cn,"/[a-z0-9_-]/i");
-    }
-
-    /* cn already used? */
-    if ($this->orig_cn != $this->cn || $this->new){
-
-      foreach($cache as $dn => $dummy){
-        if (preg_match("/^cn=".$this->cn.",/", $dn) && count($dummy)){
-          $message[]= msgPool::duplicated(_("Name"));
-          break;
-        }
-      }
-    }
-
-    /* Check external plugins */
-    $net= $this->network->check();
-    $adv= $this->advanced->check();
-    $message= array_merge($message, $net, $adv);
-
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    parent::save();
-    return ($this->attrs);
-  }
-
-
-}
-
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc b/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc
deleted file mode 100644
index 28e9cb62d4..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpSubnet extends dhcpPlugin
-{
-  /* Used attributes */
-  var $dhcpNetMask= 24;
-  var $dhcpRange= "";
-  var $range_start= "";
-  var $range_stop= "";
-  var $use_range= FALSE;
-
-  /* attribute list for save action */
-  var $objectclasses= array('top', 'dhcpSubnet', 'dhcpOptions');
-
-  function __construct($parent,$attrs)
-  {
-    parent::__construct($parent,$attrs);
-
-    if (!$this->new){
-      /* Load attributes */
-      foreach (array("dhcpNetMask", "dhcpRange") as $attr){
-        if (isset($attrs[$attr][0])){
-          $this->$attr= $attrs[$attr][0];
-        }
-      }
-      if (isset($attrs['dhcpRange']) && count($attrs['dhcpRange'])){
-        $this->use_range= TRUE;
-        list($this->range_start, $this->range_stop)= preg_split('/\s+/', $this->dhcpRange);
-      }
-    }
-
-    $this->dhcpNetMask= normalize_netmask($this->dhcpNetMask);
-  }
-
-
-  function execute()
-  {
-    $smarty= get_smarty();
-    $smarty->assign("cn", $this->cn);
-    $smarty->assign("dhcp_netmask", $this->dhcpNetMask);
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Prepare range */
-    if ($this->use_range){
-      $smarty->assign("use_range", "checked");
-      $smarty->assign("range_disabled", "");
-    } else {
-      $smarty->assign("use_range", "");
-      $smarty->assign("range_disabled", "disabled");
-    }
-    $smarty->assign("range_start", $this->range_start);
-    $smarty->assign("range_stop", $this->range_stop);
-
-    /* Show main page */
-    $display= $smarty->fetch(get_template_path('dhcp_subnet.tpl', TRUE, dirname(__FILE__))).$this->network->execute();
-
-    $display.= $this->advanced->execute();
-
-    /* Add footer */
-    $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-    if(preg_match("/w/",$this->parent->getacl(""))){
-        $display.=   "<input type=submit name='save_dhcp' value='".msgPool::saveButton()."'>&nbsp;";
-    }
-    $display.=   "<input type=submit name='cancel_dhcp' value='".msgPool::cancelButton()."'>";
-    $display.= "</div>";
-
-
-    /* Show main page */
-    return $display;
-  }
-
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-
-    /* Skip here if do not have write permissions here
-        Still executed at bottom - dhcpPlugin::save_object();
-     */
-    if(isset($_POST['dhcp_subnet_posted']) && preg_match("/w/",$this->parent->getacl(""))){
-      if (isset($_POST['cn'])){
-        $this->cn= validate(get_post('cn'));
-      }
-      if (isset($_POST['dhcp_netmask'])){
-        $this->dhcpNetMask= validate(get_post('dhcp_netmask'));
-      }
-      if (isset($_POST['use_range'])){
-        $this->use_range= TRUE;
-        $this->range_start= validate(get_post('range_start'));
-        $this->range_stop= validate(get_post('range_stop'));
-      } else {
-        $this->use_range= FALSE;
-      }
-
-      /* Move range to internal variable */
-      $this->dhcpRange= $this->range_start." ".$this->range_stop;
-    }
-    parent::save_object();
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message= array();
-
-    $cache = $this->parent->getCache();
-
-    /* All required fields are set? */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("Network address"));
-    }
-    if ($this->dhcpNetMask == ""){
-      $message[]= msgPool::required(_("Netmask"));
-    }
-
-    /* cn already used? */
-    if ($this->orig_cn != $this->cn || $this->new){
-
-      foreach($cache as $dn => $dummy){
-        if (preg_match("/^cn=".$this->cn.",/", $dn) && count($dummy)){
-          $message[]= msgPool::duplicated(_("Name"));
-          break;
-        }
-      }
-    }
-
-    /* IP's? */
-    foreach (array(
-          'dhcpNetMask' => _("Netmask"),
-          'cn'          => _("Network address"),
-          'range_start' => _("Range"),
-          'range_stop'  => _("Range")) as $attr => $str) {
-      if ($this->$attr != "" && !tests::is_ip($this->$attr)){
-        $message[]= msgPool::invalid($str,"","","192.168.0.23");
-      }
-    }
-
-    /* Check ip range */
-    if ($this->use_range){
-      if(!tests::is_ip_range($this->range_start,$this->range_stop)){
-        $message[]= msgPool::invalid(_("Network range"));
-      }
-
-      /* Check if range is in the network */
-      if (!tests::is_in_network($this->cn, $this->dhcpNetMask, $this->range_start) ||
-          !tests::is_in_network($this->cn, $this->dhcpNetMask, $this->range_stop)){
-        $message[] = _("'Range' is not inside the configured network.");
-      }
-    }
-
-    /* Check external plugins */
-    $net= $this->network->check();
-    $adv= $this->advanced->check();
-    $message= array_merge($message, $net, $adv);
-
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    parent::save();
-
-    /* Move dn to the result */
-    $this->attrs['dhcpNetMask']= array(netmask_to_bits($this->dhcpNetMask));
-    if ($this->use_range && !empty($this->dhcpRange)){
-      $this->attrs['dhcpRange']= array($this->range_start." ".$this->range_stop);
-    } else {
-      $this->attrs['dhcpRange']= array();
-    }
-
-    return ($this->attrs);
-  }
-
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_dhcpTSigKey.inc b/dhcp/admin/systems/services/dhcp/class_dhcpTSigKey.inc
deleted file mode 100644
index 5841399032..0000000000
--- a/dhcp/admin/systems/services/dhcp/class_dhcpTSigKey.inc
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-class dhcpTSigKey extends dhcpPlugin
-{
-  /* Used attributes */
-  var $dhcpKeyAlgorithm="";
-  var $dhcpKeySecret="";
-
-  /* attribute list for save action */
-  var $objectclasses= array("top", "dhcpTSigKey");
-
-  function __construct($parent,$attrs)
-  {
-    parent::__construct($parent,$attrs);
-
-    /* Load attributes */
-    if (!$this->new){
-      $this->dhcpKeyAlgorithm= $attrs['dhcpKeyAlgorithm'][0];
-      $this->dhcpKeySecret= $attrs['dhcpKeySecret'][0];
-    }
-
-  }
-
-  function execute()
-  {
-    $smarty= get_smarty();
-    $smarty->assign("cn", $this->cn);
-    $dhcpKeyAlgorithm=preg_replace('/\s.*$/', '', $this->dhcpKeyAlgorithm);
-    $smarty->assign("dhcpKeyAlgorithm",$dhcpKeyAlgorithm);
-    $smarty->assign("dhcpKeyAlgorithms",array("HMAC-MD5" => _("HMAC-MD5"),"RSAMD5" => _("RSAMD5"),"RSASHA1" => _("RSASHA1"),"DSA" => _("DSA"),"DH" => _("DH")));
-    $smarty->assign("dhcpKeySecret",$this->dhcpKeySecret);
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-
-    /* Show main page */
-    $display= $smarty->fetch(get_template_path('dhcp_tsigkey.tpl', TRUE,dirname(__FILE__)));
-
-
-    /* Add footer */
-    $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-    if(preg_match("/w/",$this->parent->getacl(""))){
-        $display.=   "<input type=submit name='save_dhcp' value='".msgPool::saveButton()."'>&nbsp;";
-    }
-    $display.=   "<input type=submit name='cancel_dhcp' value='".msgPool::cancelButton()."'>";
-    $display.= "</div>";
-
-    return ($display);
-  }
-
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* Save remaining attributes */
-    if (isset($_POST['dhcp_tsigkey_posted']) && preg_match("/w/",$this->parent->getacl(""))){
-
-      if (isset($_POST['dhcpKeyAlgorithm'])){
-        $this->dhcpKeyAlgorithm=get_post('dhcpKeyAlgorithm');
-      }
-
-      if (isset($_POST['dhcpKeySecret'])){
-        $this->dhcpKeySecret=get_post('dhcpKeySecret');
-      }
-      if (isset($_POST['cn'])){
-        $this->cn=get_post('cn');
-      }
-
-    }
-
-    parent::save_object();
-  }
-
-
-  /* Check values */
-  function check()
-  {
-    $message= array();
-
-    /* All required fields are set? */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("Key name"));
-    }
-
-    if ($this->dhcpKeySecret == ""){
-      $message[]= msgPool::required(_("Key"));
-    }
-
-
-    /* cn already used? */
-    if (($this->orig_cn != $this->cn) || $this->new) {
-      $cache = array();
-      if (isset($this->parent) && method_exists($this->parent, 'getCache')) {
-        $cache = $this->parent->getCache();
-      }
-      foreach ($cache as $dn => $dummy) {
-        if (preg_match('/^cn='.$this->cn.',/', $dn) && count($dummy)) {
-          $message[] = msgPool::duplicated(_('Key name'));
-          break;
-        }
-      }
-    }
-
-    /* Check external plugins */
-    $net= $this->network->check();
-    $adv= $this->advanced->check();
-    $message= array_merge($message, $net, $adv);
-
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    parent::save();
-
-     if ($this->dhcpKeyAlgorithm != ""){
-      $this->attrs['dhcpKeyAlgorithm']= array($this->dhcpKeyAlgorithm);
-    } else {
-      $this->attrs['dhcpKeyAlgorithm']= array();
-    }
-
-
-     if ($this->dhcpKeySecret != ""){
-      $this->attrs['dhcpKeySecret']= array($this->dhcpKeySecret);
-    } else {
-      $this->attrs['dhcpKeySecret']= array();
-    }
-
-    return ($this->attrs);
-  }
-
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc b/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
index 3feb2258c9..bc58abdb15 100644
--- a/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
+++ b/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
@@ -1,9 +1,7 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2015-2016  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,418 +18,22 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-
-class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
-{
-  protected $dialogClass = 'DhcpSectionCreationDialog';
-
-  protected $subnet_expanded = FALSE;
-  protected $dhcpObjectCache = array();
-
-  protected function getAttributeArrayValue($key, $value)
-  {
-    $id = $this->getHtmlId();
-    $subnetExpandImg = $this->renderInputField(
-      'image', $id.'_expandDHCP_'.$key,
-      array(
-        'src'   => 'images/lists/expand.png',
-        'title' => _('Expand DHCP subnet'),
-        'alt'   => _('Expand'),
-        'class' => 'center',
-        'style' => 'padding:5px 6px 4px;'
-      )
-    );
-    $subnetExpandedImg = $this->renderInputField(
-      'image', $id.'_foldDHCP_'.$key,
-      array(
-        'src'   => 'images/down-arrow.png',
-        'title' => _('Fold DHCP subnet'),
-        'alt'   => _('Fold'),
-        'class' => 'center',
-        'style' => 'padding:6px 5px 6px 4px;'
-      )
-    );
-    $dn = $value[0];
-    if (empty($this->dhcpObjectCache[$dn])) {
-      return array('not in cache',$dn,'');
-    }
-
-    //~ $link = "<a href='?plug=".$_GET['plug']."&act=edit&id=".$key."'>".$value[1]."</a>";
-    $link = $value[1];
-
-    $objtype = $this->objectType($dn);
-    $dhcpObject = new $objtype($this, $this->dhcpObjectCache[$dn]);
-    if (count(serviceDHCP::$sectionMap[$objtype])) {
-      if ($objtype == 'dhcpService') {
-        if ($dn === $this->subnet_expanded) {
-          $link = $subnetExpandedImg.$link;
-        } else {
-          $link = $subnetExpandImg.$link;
-        }
-        return array(
-          array('html' => $link),
-          '',
-          '',
-        );
-      } else {
-        if ($objtype == 'dhcpSubnet') {
-          if ($dn === $this->subnet_expanded) {
-            $link = '&nbsp;&nbsp;'.$subnetExpandedImg.$link;
-          } else {
-            $link = '&nbsp;&nbsp;'.$subnetExpandImg.$link;
-          }
-        }
-        return array(
-          array('html' => $link),
-          array('html' => $dhcpObject->options->get('routers')),
-          ''
-        );
-      }
-    } else {
-      return array(
-        array('html' => $link),
-        array('html' => $dhcpObject->statements->get('fixed-address')),
-        array('html' => preg_replace('/^[^ ]+ /', '', isset($dhcpObject->dhcpHWAddress) ? $dhcpObject->dhcpHWAddress : '')),
-      );
-    }
-  }
-
-  protected function genRowIcons($key, $value)
-  {
-    $id = $this->getHtmlId();
-    list ($img, $width) = parent::genRowIcons($key, $value);
-    $img = $this->renderInputField(
-      'image', $id.'_insertDHCP_'.$key,
-      array(
-        'src'   => 'geticon.php?context=actions&amp;icon=document-new&amp;size=16',
-        'title' => _('Insert new DHCP section'),
-        'alt'   => _('Insert new DHCP section'),
-        'class' => 'center',
-      )
-    ).'&nbsp;'.$img;
-    $width += 15;
-
-    return array ($img, $width);
-  }
-
-  protected function handlePostValueActions($id, $postValue)
-  {
-    if (parent::handlePostValueActions($id, $postValue)) {
-      return TRUE;
-    }
-    if (preg_match('/^'.$id.'_expandDHCP_/', $postValue)) {
-      $key = preg_replace('/^'.$id.'_expandDHCP_/', '', $postValue);
-      $key = preg_replace('/_[xy]$/', '', $key);
-
-      $this->subnet_expanded = $this->value[$key][0];
-      $this->reload(FALSE);
-      $this->postValue = $this->value;
-
-      return TRUE;
-    }
-    if (preg_match('/^'.$id.'_foldDHCP_/', $postValue)) {
-      $this->subnet_expanded = FALSE;
-      $this->reload(FALSE);
-      $this->postValue = $this->value;
-
-      return TRUE;
-    }
-    if (preg_match('/^'.$id.'_insertDHCP_/', $postValue)) {
-      $key = preg_replace('/^'.$id.'_insertDHCP_/', '', $postValue);
-      $key = preg_replace('/_[xy]$/', '', $key);
-
-      $dn = $this->value[$key][0];
-      $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this, $this->objectType($dn), $dn));
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-  protected function handleEdit($key)
-  {
-    $dn           = $this->value[$key][0];
-    $editingValue = $this->dhcpObjectCache[$dn];
-    $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this, $this->objectType($dn), $dn, $editingValue));
-  }
-
-  function delPostValue($key)
-  {
-    $dn = $this->postValue[$key][0];
-    $this->dhcpObjectCache[$dn] = array();
-    foreach ($this->postValue as $i => $value) {
-      if (preg_match('/'.preg_quote($dn, '/').'$/', $value[0])) {
-        unset($this->postValue[$i]);
-        $this->dhcpObjectCache[$value[0]] = array();
-      }
-    }
-    parent::delPostValue($key);
-  }
-
-  /* Should be addValue but we need more attributes */
-  function editEnded($dn, $object, $olddn = FALSE)
-  {
-    $this->dhcpObjectCache[$dn] = $object;
-    if (($olddn !== FALSE) && ($olddn !== $dn)) {
-      /* If we renamed a section, we've to rename a couple of objects, too */
-      foreach ($this->dhcpObjectCache as $key => $dsc) {
-        if (preg_match("/,$olddn$/", $key)) {
-          $new_dn = preg_replace("/,$olddn$/", ','.$dn, $key);
-          $dsc['MODIFIED'] = TRUE;
-          $this->dhcpObjectCache[$new_dn] = $dsc;
-          $this->dhcpObjectCache[$key]    = array();
-        }
-      }
-    }
-    $this->reload(FALSE);
-  }
-
-  protected function loadAttrValue ($attrs)
-  {
-  }
-
-  /* Not saving anything into base node */
-  function fillLdapValue (&$attrs)
-  {
-    /* Remove crap made by plugin */
-    unset ($attrs[$this->getLdapName()]);
-  }
-
-  function setParent (&$plugin)
-  {
-    parent::setParent($plugin);
-    if (is_object($this->plugin)) {
-      $this->reload();
-    }
-  }
-
-  /* Subfonction of reload function */
-  function reload_readItemFromLDAP(&$ldap, $attrs, &$final, $erase)
-  {
-    global $config;
-    $sattrs = array();
-    $dn     = $ldap->getDN();
-
-    if (isset($this->dhcpObjectCache[$dn]) && !$erase) {
-      $sattrs = $this->dhcpObjectCache[$dn];
-    } else {
-      for ($i = 0; $i < $attrs['count']; $i++) {
-        $sattrs[$attrs[$i]] = $attrs[$attrs[$i]];
-        unset($sattrs[$attrs[$i]]['count']);
-      }
-      $sattrs['dn'] = $dn;
-      foreach ($sattrs as $name => $values) {
-        if ($name == 'dhcpOption') {
-          foreach ($values as $key => $value) {
-            $value_name   = trim(preg_replace('/[^ ]*$/', '', $value));
-            $value_value  = trim(preg_replace('/^[^ ]*/', '', $value));
-            if (in_array($value_name, serviceDHCP::$quote_option)) {
-              $value_value = preg_replace('/^"/', '', $value_value);
-              $value_value = preg_replace('/"$/', '', $value_value);
-              $sattrs[$name][$key] = $value_name.' '.$value_value;
-            }
-          }
-        }
-      }
-      $this->dhcpObjectCache[$dn] = $sattrs;
-    }
-
-    if ($dn === $this->subnet_expanded) {
-      $ldap_subnet = $config->get_ldap_link();
-      $ldap_subnet->cd($dn);
-      $ldap_subnet->ls('(objectClass=dhcpHost)');
-      while ($host_attrs = $ldap_subnet->fetch()) {
-        $this->reload_readItemFromLDAP($ldap_subnet, $host_attrs, $final, $erase);
-      }
-    }
-  }
-
-  /* Subfonction of reload function */
-  function reload_refreshListFromCache(&$final)
-  {
-    foreach ($this->dhcpObjectCache as $dn => $sattrs) {
-      if (empty($sattrs)) {
-        continue;
-      }
-      $type_id = NULL;
-      foreach ($this->plugin->types as $key => $val) {
-        if (in_array($key, $sattrs['objectClass'])) {
-          $type     = $val;
-          $type_id  = $key;
-          break;
-        }
-      }
-      if ($type_id === NULL) {
-        trigger_error('Unknown DHCP type for '.$dn);
-      }
-
-      if (($type_id == 'dhcpHost') && (preg_replace('/^[^,]+,/', '', $dn) != $this->subnet_expanded)) {
-        continue;
-      }
-
-      $tmp = preg_replace("/".$this->plugin->dhcpServiceDN."/", "", $dn);
-      $indent = substr_count($tmp, ",");
-      if ($type_id == "dhcpSubnet") {
-        $indent--;
-      }
-      if ($indent > 0) {
-        $spaces = "&nbsp;&nbsp;";
-      } else {
-        $spaces = "";
-      }
-      for ($i = 0; $i < $indent; $i++) {
-        $spaces .= "&nbsp;&nbsp;&nbsp;&nbsp;";
-      }
-
-      /* Prepare for sorting... */
-      $sortpart = explode(",", $dn);
-      $sortpart = array_reverse($sortpart);
-      $tmp = implode(",", $sortpart);
-      $final[$dn] = $tmp."!".$spaces.$type." '".$sattrs['cn'][0]."'";
-    }
-  }
-
-  function reload($erase = TRUE)
-  {
-    global $config;
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $erase, "reload");
-    /* Init LDAP and load list */
-    $ldap = $config->get_ldap_link();
-    $ui   = get_userinfo();
-    $me   = $this->plugin->dn;
-    if (empty($me)) {
-      trigger_error('reload launched with empty dn');
-    }
-
-    $filter = "(&(objectClass=dhcpService)(|(dhcpPrimaryDN=$me)(dhcpSecondaryDN=$me)(dhcpServerDN=$me)(dhcpFailOverPeerDN=$me)))";
-
-    $list   = get_list($filter, array("server"), $config->current['BASE'], array("cn"), GL_SIZELIMIT | GL_SUBSEARCH);
-    $final  = array();
-
-    foreach ($list as $value) {
-      /* Set header */
-      $sortpart = explode(",", $value['dn']);
-      $sortpart = array_reverse($sortpart);
-      $tmp = implode(",", $sortpart);
-
-      $final[$value['dn']] = $tmp."!"._("Global options");
-
-      /* Read all sub entries to place here */
-      $ldap->cd($value['dn']);
-      $ldap->search("(|(objectClass=dhcpService)(objectClass=dhcpClass)(objectClass=dhcpSubClass)(objectClass=dhcpGroup)(objectClass=dhcpPool)(objectClass=dhcpSubnet)(objectClass=dhcpSharedNetwork)(objectClass=dhcpTSigKey)(objectClass=dhcpDnsZone)(objectClass=dhcpFailOverPeer))", array());
-
-      while ($attrs = $ldap->fetch()) {
-        $this->reload_readItemFromLDAP($ldap, $attrs, $final, $erase);
-      }
-    }
-    $this->reload_refreshListFromCache($final);
-
-    /* Sort it... */
-    natsort($final);
-    $this->value = array();
-    foreach ($final as $dn => $val) {
-      $this->value[] = array($dn, preg_replace('/^[^!]+!(.*)$/', '\\1', $val));
-    }
-
-    if (empty($final)) {
-      $this->add_global_node();
-    }
-  }
-
-  function add_global_node()
-  {
-    $attrs = array(
-      'dn'              => 'cn=dhcp,'.$this->plugin->dn,
-      'cn'              => array('dhcp'),
-      'objectClass'     => array('top', 'dhcpService'),
-      'dhcpPrimaryDN'   => array($this->plugin->dn),
-      'dhcpStatements'  => array(
-        'default-lease-time 600',
-        'max-lease-time 1200',
-        'authoritative',
-        'ddns-update-style none'
-      ),
-      'MODIFIED' => TRUE,
-    );
-
-    $this->value[] = array('cn=dhcp,'.$this->plugin->dn, _('Global options'));
-    $this->dhcpObjectCache['cn=dhcp,'.$this->plugin->dn]  = $attrs;
-  }
-
-  function objectType($dn)
-  {
-    $types = array_keys($this->plugin->types);
-
-    foreach ($this->dhcpObjectCache[$dn]['objectClass'] as $oc) {
-      if (in_array($oc, $types)) {
-        return $oc;
-      }
-    }
-
-    /* That should not happen... */
-    msg_dialog::display(_('Error'), _('The DHCP configuration set is unkown. Please contact your system administrator.'), ERROR_DIALOG);
-
-    return '';
-  }
-
-  function getCache()
-  {
-    return $this->dhcpObjectCache;
-  }
-
-  function renderButtons ()
-  {
-    return '';
-  }
-
-  public function htmlIds()
-  {
-    $ids = parent::htmlIds();
-    unset($ids[0]);
-    return $ids;
-  }
-}
-
 class serviceDHCP extends simpleService
 {
   var $objectclasses = array('dhcpServer');
 
-  var $types = array();
-
-  static $sectionMap = array(
-    'dhcpService'       => array(
-      'dhcpSharedNetwork','dhcpSubnet','dhcpGroup',
-      'dhcpHost','dhcpClass','dhcpTSigKey','dhcpDnsZone'
-    ),
-    'dhcpClass'         => array('dhcpSubClass'),
-    'dhcpSubClass'      => array(),
-    'dhcpHost'          => array(),
-    'dhcpGroup'         => array('dhcpHost'),
-    'dhcpPool'          => array(),
-    'dhcpSubnet'        => array(
-      'dhcpPool','dhcpGroup',
-      'dhcpHost','dhcpClass','dhcpTSigKey','dhcpDnsZone'
-    ),
-    'dhcpSharedNetwork' => array('dhcpSubnet', 'dhcpPool','dhcpTsigKey','dhcpDnsZone'),
-    'dhcpTSigKey'       => array(),
-    'dhcpDnsZone'       => array()
-  );
-
-  static $quote_option = array('domain-name');
-
   static function getAttributesInfo ()
   {
     return array(
       'main' => array(
-        'name'  => _('DHCP sections'),
+        'name'  => _('DHCP configurations'),
         'class' => array('fullwidth'),
         'attrs' => array(
-          new HiddenAttribute (
-            'dhcpServiceDN', _('The DN of dhcpService object which contain the configuration information'),
-            'dhcpServiceDN'
-          ),
-          new DhcpSectionsAttribute (
-            '', _('The DHCP sections handled by this server'),
-            'dhcpSections', FALSE
+          new SetAttribute(
+            new SelectAttribute (
+              '', _('The DN of dhcpService object(s) which contain the configuration information'),
+              'dhcpServiceDN'
+            )
           )
         )
       ),
@@ -446,163 +48,25 @@ class serviceDHCP extends simpleService
       'plIcon'        => 'geticon.php?context=applications&icon=dhcp&size=16',
 
       'plProvidedAcls' => array(
-        'start'         => _('Start service'),  // Remove this to hide the start button at all.
-        'stop'          => _('Stop service'),   // Remove this to hide the stop button at all.
-        'restart'       => _('Restart service') // Remove this to hide the restart button at all.
+        // Remove this to hide the start button at all.
+        'start'         => _('Start service'),
+        // Remove this to hide the stop button at all.
+        'stop'          => _('Stop service'),
+        // Remove this to hide the restart button at all.
+        'restart'       => _('Restart service')
       )
     );
   }
 
   function __construct ($dn = NULL, $parent = NULL)
   {
-    $this->types = array(
-      'dhcpLog'           => _('Logging'),
-      'dhcpService'       => _('Global options'),
-      'dhcpClass'         => _('Class'),
-      'dhcpSubClass'      => _('Subclass'),
-      'dhcpHost'          => _('Host'),
-      'dhcpGroup'         => _('Group'),
-      'dhcpPool'          => _('Pool'),
-      'dhcpSubnet'        => _('Subnet'),
-      'dhcpFailOverPeer'  => _('Failover peer'),
-      'dhcpSharedNetwork' => _('Shared network'),
-      'dhcpTSigKey'       => _('DNS update key'),
-      'dhcpDnsZone'       => _('DNS update zones')
-    );
-
-    parent::__construct($dn, $parent);
-
-    $this->dhcpServiceDN = 'cn=dhcp,'.$dn;
-    $this->attributesAccess['dhcpSections']->setHeight(400);
-  }
-
-  function getCache()
-  {
-    return $this->attributesAccess['dhcpSections']->getCache();
-  }
-
-  protected function ldap_remove ()
-  {
-    global $config;
-    /* Remove subtrees */
-    $ldap   = $config->get_ldap_link();
-    $cache  = $this->getCache();
-    foreach ($cache as $dn => $content) {
-      if ($this->attributesAccess['dhcpSections']->objectType($dn) == 'dhcpService') {
-        $ldap->rmdir_recursive($dn);
-        if (!$ldap->success()) {
-          msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_DEL, get_class()), LDAP_ERROR);
-        }
-      }
-    }
-
-    return parent::ldap_remove();
-  }
-
-  protected function ldap_save($cleanup = TRUE)
-  {
-    global $config;
-    /* Save dhcp settings */
-    $ldap   = $config->get_ldap_link();
-    $cache  = $this->getCache();
-    foreach ($cache as $dn => $data) {
-      if ($this->dn != $this->orig_dn) {
-        $dn = preg_replace('/'.preg_quote($this->orig_dn, '/').'$/i', $this->dn, $dn);
-      }
-
-      /* Remove entry? */
-      if (count($data) == 0) {
-        /* Check if exists, then remove... */
-        if ($ldap->cat($dn)) {
-          $ldap->rmdir_recursive($dn);
-          if (!$ldap->success()) {
-            msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class()), LDAP_ERROR);
-          }
-        }
-        continue;
-      }
-
-      /* Update dhcp option 'server-name' to actual server name */
-      if ($this->dn != $this->orig_dn) {
-        foreach (array('dhcpHost','dhcpSubnet','dhcpGroup','dhcpSharedNetwork') as $object) {
-          if (in_array($object, $data['objectClass']) && isset($data['dhcpOption'])) {
-            foreach ($data['dhcpOption'] as $key => $option) {
-              if (preg_match('/^server-name /', $option)) {
-                $data['dhcpOption'][$key] = 'server-name '.$this->parent->parent->getBaseObject()->cn;
-                $data['MODIFIED'] = TRUE;
-                break;
-              }
-            }
-          }
-        }
-      }
-
-      /* Modify existing entry? */
-      if (isset($data['MODIFIED']) || $this->orig_dn != $this->dn) {
-        if ($ldap->cat($dn)) {
-          $modify = TRUE;
-        } else {
-          $modify = FALSE;
-        }
-
-        /* Build new entry */
-        $attrs = array();
-        foreach ($data as $attribute => $values) {
-          if ($attribute == 'MODIFIED' || $attribute == 'dn') {
-            continue;
-          }
-
-          if (in_array($attribute, array('dhcpPrimaryDN','dhcpSecondaryDN','dhcpServerDN','dhcpFailOverPeerDN'))) {
-            foreach ($values as $v_key => $value) {
-              $values[$v_key] = preg_replace('/'.preg_quote($this->orig_dn, '/').'$/i', $this->dn, $value);
-            }
-          }
-
-          if (count($values)) {
-            if ($attribute == 'dhcpOption') {
-              foreach ($values as $key => $value) {
-                $option_name  = trim(preg_replace('/[^ ]*$/', '', $value));
-                $option_value = trim(preg_replace('/^[^ ]*/', '', $value));
-                if (in_array($option_name, self::$quote_option)) {
-                  $values[$key] = $option_name.' "'.$option_value.'"';
-                }
-              }
-            }
-            if (count($values) == 1) {
-              $attrs[$attribute] = $values[0];
-            } else {
-              $attrs[$attribute] = $values;
-            }
-          } elseif ($modify) {
-            $attrs[$attribute] = array();
-          }
-        }
-
-        $ldap->cd($dn);
-        if ($modify) {
-          $ldap->modify($attrs);
-          if (!$ldap->success()) {
-            msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class()), LDAP_ERROR);
-          }
-        } else {
-          $ldap->add($attrs);
-          if (!$ldap->success()) {
-            msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_ADD, get_class()), LDAP_ERROR);
-          }
-        }
-      }
-    }
-
-    if ($this->dn != $this->orig_dn) {
-      $this->dhcpServiceDN = preg_replace('/'.preg_quote($this->orig_dn, '/').'$/i', $this->dn, $this->dhcpServiceDN);
-    }
-
-    /* Replace 'new' dn */
-    if (preg_match('/new$/', $this->dhcpServiceDN)) {
-      $this->dhcpServiceDN = preg_replace('/new$/', $this->dn, $this->dhcpServiceDN);
-    }
+    $attributesInfo = $this->getAttributesInfo();
+    $services = objects::ls('dhcpConfiguration');
+    $attributesInfo['main']['attrs'][0]->attribute->setChoices(array_keys($services), array_values($services));
+    parent::__construct($dn, $parent, $attributesInfo);
 
-    parent::ldap_save($cleanup);
+    // TODO: On save fill dhcpPrimaryDn on the dhcpService objects
+    // Also add a foreign key
   }
 }
 ?>
diff --git a/dhcp/admin/systems/services/dhcp/dhcpNewSection.tpl b/dhcp/admin/systems/services/dhcp/dhcpNewSection.tpl
deleted file mode 100644
index eb1a7a5871..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcpNewSection.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<div style="font-size: 18px;">
-  {t}Create new DHCP section{/t}
-</div>
-<br>
-<p class="seperator">
-<b>{t}Please choose one of the following DHCP section types.{/t}</b>
-</p>
-<br>
-{t}Section{/t}&nbsp;
-<select size="1" id="section" name="section" title="{t}Choose section type to create{/t}">
-  {html_options options=$sections}
-</select>
-
-<p class="plugbottom">
-  <input type=submit name="create_section" value="{t}Create{/t}">
-  &nbsp;
-  <input type=submit name="cancel_section" value="{msgPool type=cancelButton}">
-</p>
-
-<!-- Place cursor -->
-<script type="text/javascript">
-  <!--
-  focus_field('section');
-  -->
-</script>
diff --git a/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl b/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl
deleted file mode 100644
index 1b2687fd9c..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{* FusionDirectory dhcp sharedNetwork - smarty template *}
-
-<p class='seperator'></p>
-<br>
-
-{if $show_advanced}
-
-<input type='submit' name='hide_advanced' value='{t}Hide advanced settings{/t}'>
-
-<table width="100%">
- <tr>
-
-  <td width="50%">
-   <br>
-   <b>{t}DHCP statements{/t}</b>
-   <br>
-{render acl=$acl}
-   <select name='dhcpstatements' style="width:100%;" size="14">
-    {html_options options=$dhcpstatements}
-   </select>
-{/render}
-   <br>
-{render acl=$acl}
-   <input type='text' name='addstatement' size='25' maxlength='250'>&nbsp;
-{/render}
-{render acl=$acl}
-   <input type='submit' name='add_statement' value='{msgPool type=addButton}'>&nbsp;
-{/render}
-{render acl=$acl}
-   <input type='submit' name='delete_statement' value='{msgPool type=delButton}'> 
-{/render}
-  </td>
-
-  <td>
-   <br>
-   <b>{t}DHCP options{/t}</b>
-   <br>
-{render acl=$acl}
-   <select name='dhcpoptions' style="width:100%;" size="14">
-    {html_options options=$dhcpoptions}
-   </select>
-{/render}
-   <br>
-{render acl=$acl}
-   <input type='text' name='addoption' size='25' maxlength='250'>&nbsp;
-{/render}
-{render acl=$acl}
-   <input type='submit' name='add_option' value='{msgPool type=addButton}'>&nbsp;
-{/render}
-{render acl=$acl}
-   <input type='submit' name='delete_option' value='{msgPool type=delButton}'> 
-{/render}
-  </td>
- </tr>
-</table>
-
-{else}
-
-<input type='submit' name='show_advanced' value='{t}Show advanced settings{/t}'>
-
-{/if}
-<p class='seperator'>&nbsp;</p>
diff --git a/dhcp/admin/systems/services/dhcp/dhcp_dnszone.tpl b/dhcp/admin/systems/services/dhcp/dhcp_dnszone.tpl
deleted file mode 100644
index b928a610fe..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcp_dnszone.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{* FusionDirectory dhcp host - smarty template *}
-<h3>{t}DNS update zone{/t}</h3>
-
-<table>
- <tr>
-   <td>{t}DNS zone{/t}{$must}</td>
-   <td>
-     <select name='cn' >
-       {html_options options=$cns selected=$cn}
-     </select>
-   </td>
- </tr>
-   <td>{t}DNS server{/t}{$must}</td>
-   <td>
-     <select name='dhcpDnsZoneServer'  >
-       {html_options options=$dhcpDnsZoneServers selected=$dhcpDnsZoneServer}
-     </select>
-   </td>
- </tr>
- <tr>
-   <td>{t}Key DN{/t}{$must}</td>
-   <td>
-     <select name='dhcpKeyDN'>
-       {html_options options=$dhcpKeyDNs selected=$dhcpKeyDN}
-     </select>
-  </td>
- </tr>
-</table>
-
-<input type='hidden' name='dhcp_dnszone_posted' value='1'>
-
-<p class="seperator"></p>
-
-<!-- Place cursor in correct field -->
-<script type="text/javascript">
-  <!-- // First input field on page
-  focus_field('cn');
-  -->
-</script>
diff --git a/dhcp/admin/systems/services/dhcp/dhcp_group.tpl b/dhcp/admin/systems/services/dhcp/dhcp_group.tpl
deleted file mode 100644
index 7b3751e801..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcp_group.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{* FusionDirectory dhcp sharedNetwork - smarty template *}
-<p><b>{t}Generic{/t}</b></p>
-<table>
- <tr>
-  <td>
-   {t}Name{/t}{$must}
-  </td>
-  <td>
-{render acl=$acl}
-   <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
-        title='{t}Name of group{/t}'>
-{/render}
-  </td>
- </tr>
-</table>
-
-<p class="seperator">&nbsp;</p>
-
-<!-- Place cursor in correct field -->
-<script type="text/javascript">
-  <!-- // First input field on page
-  focus_field('cn');
-  -->
-</script>
diff --git a/dhcp/admin/systems/services/dhcp/dhcp_host.tpl b/dhcp/admin/systems/services/dhcp/dhcp_host.tpl
deleted file mode 100644
index bcc2711f54..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcp_host.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-{* FusionDirectory dhcp host - smarty template *}
-<p><b>{t}Generic{/t}</b></p>
-<table width="100%">
- <tr>
-  <td width="50%" style="vertical-align:top">
-   <table>
-    <tr>
-     <td>{t}Name{/t}{$must}</td>
-     <td>
-{render acl=$acl}
-      <input {if $realGosaHost} disabled {/if} id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
-             title='{t}Name of host{/t}'>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Fixed address{/t}</td>
-     <td>
-{render acl=$acl}
-      <input {if $realGosaHost} disabled {/if}
-      type='text' name='fixedaddr' size='25' maxlength='80' value='{$fixedaddr}'
-             title='{t}Use hostname or IP-address to assign fixed address{/t}'>
-{/render}
-     </td>
-    </tr>
-   </table>
-  </td>
-  <td>
-   <table>
-    <tr>
-     <td>{t}Hardware type{/t}</td>
-     <td>
-{render acl=$acl}
-      <select name='hwtype'  {if $realGosaHost} disabled {/if} >
-       {html_options options=$hwtypes selected=$hwtype}
-      </select>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Hardware address{/t}{$must}</td>
-     <td>
-{render acl=$acl}
-      <input  {if $realGosaHost}  disabled {/if} type='text' name='dhcpHWAddress' size='20' maxlength='18' value='{$dhcpHWAddress}'>
-{/render}
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-<input type='hidden' name='dhcp_host_posted' value='1'>
-<p class="seperator"></p>
-
-<!-- Place cursor in correct field -->
-<script type="text/javascript">
-  <!-- // First input field on page
-   focus_field('cn');
-  -->
-</script>
diff --git a/dhcp/admin/systems/services/dhcp/dhcp_network.tpl b/dhcp/admin/systems/services/dhcp/dhcp_network.tpl
deleted file mode 100644
index 15e940c40a..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcp_network.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-{* FusionDirectory dhcp sharedNetwork - smarty template *}
-<table width="100%">
- <tr>
-  <td width="50%" style="vertical-align:top">
-   <p><b>{t}Network configuration{/t}</b></p>
-   <table>
-    <tr>
-     <td>{t}Router{/t}</td>
-     <td>
-{render acl=$acl}
-      <input id='routers' type='text' name='routers' size='25' maxlength='80' value='{$routers}'
-              title='{t}Enter name or IP address of router to be used in this section{/t}'>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Netmask{/t}</td>
-     <td>
-{render acl=$acl}
-      <input type='text' name='subnet_mask' size='18' maxlength='15' value='{$subnet_mask}'>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Broadcast{/t}</td>
-     <td>
-{render acl=$acl}
-      <input type='text' name='broadcast_address' size='18' maxlength='15' value='{$broadcast_address}'>
-{/render}
-     </td>
-    </tr>
-   </table>
-   <br>
-   <br>
-   <p><b>{t}Bootup{/t}</b></p>
-   <table>
-    <tr>
-     <td>{t}Filename{/t}</td>
-     <td>
-{render acl=$acl}
-      <input type='text' name='filename' size='25' maxlength='80' value='{$filename}'
-              title='{t}Enter name of file that will be loaded via tftp after client has started{/t}'>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Next server{/t}</td>
-     <td>
-{render acl=$acl}
-      <input type='text' name='nextserver' size='25' maxlength='80' value='{$nextserver}'
-              title='{t}Enter name of server to retrieve bootimages from{/t}'>
-{/render}
-     </td>
-    </tr>
-   </table>
-
-  </td>
-  <td style="vertical-align:top">
-   <p><b>{t}Domain Name Service{/t}</b></p>
-   <table>
-    <tr>
-     <td>{t}Domain{/t}</td>
-     <td>
-{render acl=$acl}
-      <input type='text' name='domain' size='25' maxlength='80' value='{$domain}'
-              title='{t}Name of domain{/t}'>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td colspan=2>
-      <br>
-      {t}DNS server{/t}<br>
-{render acl=$acl}
-      <select name='dnsserver'  title='{t}List of DNS servers to be propagated{/t}' style="width:350px;" size="4">
-       {html_options options=$dnsservers}
-      </select>
-{/render}
-      <br>
-{render acl=$acl}
-      <input type='text' name='addserver' size='25' maxlength='80' title='{t}DNS server do be added{/t}'>&nbsp;
-{/render}
-{render acl=$acl}
-      <input type='submit' name='add_dns' value='{msgPool type=addButton}' title='{t}Click here add the selected server to the list{/t}'>
-{/render}
-{render acl=$acl}
-      <input type='submit' name='delete_dns' value='{msgPool type=delButton}' title='{t}Click here remove the selected servers from the list{/t}'>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td colspan=2>
-      <p><b>{t}Domain Name Service options{/t}</b></p>
-{render acl=$acl}
-      <input type=checkbox name="autohost" value="1" {$autohost}>{t}Assign hostnames found via reverse mapping{/t}
-{/render}
-      <br>
-{render acl=$acl}
-      <input type=checkbox name="autohostdecl" value="1" {$autohostdecl}>{t}Assign hostnames from host declarations{/t}
-{/render}
-     </td>
-    </tr>
-   </table>
-
-  </td>
- </tr>
-</table>
-<!-- Place cursor in correct field -->
-<script type="text/javascript">
-  <!-- // First input field on page
-     focus_field('cn','routers');
-  -->
-</script>
-
diff --git a/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl b/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl
deleted file mode 100644
index d24f1ddf2a..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{* FusionDirectory dhcp sharedNetwork - smarty template *}
-<p><b>{t}Generic{/t}</b></p>
-<table width="100%">
- <tr>
-  <td width="50%">
-   {t}Name{/t}{$must}&nbsp;
-{render acl=$acl}
-   <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
-        title='{t}Name of pool{/t}'>
-{/render}
-  </td>
-  <td>
-   {t}Range{/t}{$must}&nbsp;
-{render acl=$acl}
-   <input type='text' name='range_start' size='25' maxlength='30' value='{$range_start}'>
-{/render}
-   &nbsp;-&nbsp;
-{render acl=$acl}
-   <input type='text' name='range_stop' size='25' maxlength='30' value='{$range_stop}'>
-{/render}
-  </td>
- </tr>
-</table>
-
-<p class="seperator">&nbsp;</p>
-
-<!-- Place cursor in correct field -->
-<script type="text/javascript">
-  <!-- // First input field on page
-  document.mainform.cn.focus();
-  -->
-</script>
diff --git a/dhcp/admin/systems/services/dhcp/dhcp_service.tpl b/dhcp/admin/systems/services/dhcp/dhcp_service.tpl
deleted file mode 100644
index 31d1f359df..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcp_service.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<p><b>{t}Generic{/t}</b></p>
-
-<table width="100%">
- <tr>
-  <td width="50%">
-{render acl=$acl}
-  <input id='authoritative' type=checkbox name="authoritative" value="1" {if $authoritative} checked {/if}> {t}Authoritative service{/t}<br>
-{/render}
-  <br>
-  {t}Dynamic DNS update{/t}
-{render acl=$acl}
-  <select name='ddns_update_style'  title='{t}Dynamic DNS update style{/t}' size="1">
-       {html_options values=$ddns_styles output=$ddns_styles selected=$ddns_update_style}
-  </select>
-{/render}
-  </td>
-
-  <td style='vertical-align:top'>
-
-   <table>
-    <tr>
-      <td>{t}Default lease time (s){/t}</td>
-      <td>
-{render acl=$acl}
-      <input type='text' name='default_lease_time' size='25' maxlength='80' value='{$default_lease_time}' title='{t}Enter default lease time in seconds.{/t}'>
-{/render}
-      </td>
-    </tr>
-    <tr>
-      <td>{t}Maximum lease time (s){/t}</td>
-      <td>
-{render acl=$acl}
-      <input type='text' name='max_lease_time' size='25' maxlength='80' value='{$max_lease_time}' title='{t}Enter maximum lease time in seconds.{/t}'>
-{/render}
-      </td>
-    </tr>
-   </table>
-
-  </td>
-
- </tr>
-</table>
-
-<p class="seperator"></p>
-
-<!-- Place cursor in correct field -->
-<script type="text/javascript">
-  <!-- // First input field on page
-  focus_field('authoritative');
-  -->
-</script>
diff --git a/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl b/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl
deleted file mode 100644
index 76d1f2327a..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl
+++ /dev/null
@@ -1,125 +0,0 @@
-{* FusionDirectory dhcp sharedNetwork - smarty template *}
-<p><b>{t}Generic{/t}</b></p>
-<table width="100%" border="0">
- <tr>
-
-  <td width="50%">
-
-   <table>
-    <tr>
-     <td>{t}Name{/t}{$must}</td>
-     <td>
-{render acl=$acl}
-      <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}' title='{t}Name for shared network{/t}'>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Server identifier{/t}</td>
-     <td>
-{render acl=$acl}
-  <input type='text' name='server-identifier' size='25' maxlength='80' value='{$server_identifier}'
-  title='{t}Propagated server identifier for this shared network{/t}'>
-{/render}
-     </td>
-    </tr>
-   </table>
-
-  </td>
-
-  <td style="vertical-align:top;">
-   <table>
-    <tr>
-     <td>
-{render acl=$acl}
-      <input type=checkbox name="authoritative" value="1" {if $authoritative} checked {/if}
-       title="{t}Select if this server is authoritative for this shared network{/t}">{t}Authoritative server{/t}
-{/render}
-     </td>
-    </tr>
-   </table>
-  </td>
-
- </tr>
-</table>
-
-<p class="seperator">&nbsp;</p>
-
-<table width="100%">
- <tr>
-  <td width="50%">
-
-  <p><b>{t}Leases{/t}</b></p>
-   <table>
-    <tr>
-     <td>{t}Default lease time{/t}</td>
-     <td>
-{render acl=$acl}
-      <input type='text' name='default-lease-time' size='10' maxlength='25' value='{$default_lease_time}'
-        title='{t}Default lease time{/t}'>&nbsp;{t}seconds{/t}
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Max. lease time{/t}</td>
-     <td>
-{render acl=$acl}
-      <input type='text' name='max-lease-time' size='10' maxlength='25' value='{$max_lease_time}'
-        title='{t}Maximum lease time{/t}'>&nbsp;{t}seconds{/t}
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Min. lease time{/t}</td>
-     <td>
-{render acl=$acl}
-      <input type='text' name='min-lease-time' size='10' maxlength='25' value='{$min_lease_time}'
-        title='{t}Minimum lease time{/t}'>&nbsp;{t}seconds{/t}
-{/render}
-     </td>
-    </tr>
-   </table>
-
-  </td>
-
-  <td style="vertical-align:top">
-   <p><b>{t}Access control{/t}</b></p>
-   <table>
-    <tr>
-     <td>
-{render acl=$acl}
-     <input type=checkbox name="unknown-clients" value="1" {$allow_unknown_state}
-        title="{t}Select if unknown clients should get dynamic IP addresses{/t}">{t}Allow unknown clients{/t}
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>
-{render acl=$acl}
-     <input type=checkbox name="bootp" value="1" {$allow_bootp_state}
-        title="{t}Select if bootp clients should get dynamic IP addresses{/t}">{t}Allow bootp clients{/t}
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>
-{render acl=$acl}
-     <input type=checkbox name="booting" value="1" {$allow_booting_state}
-        title="{t}Select if clients are allowed to boot using this DHCP server{/t}">{t}Allow booting{/t}
-{/render}
-     </td>
-    </tr>
-   </table>
-  </td>
-
- </tr>
-</table>
-
-<p class="seperator">&nbsp;</p>
-
-<!-- Place cursor in correct field -->
-<script type="text/javascript">
-  <!-- // First input field on page
-  document.mainform.cn.focus();
-  -->
-</script>
diff --git a/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl b/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl
deleted file mode 100644
index b5066b29ba..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-{* FusionDirectory dhcp subnet - smarty template *}
-<p><b>{t}Generic{/t}</b></p>
-<table width="100%">
- <tr>
-  <td width="50%">
-   <table>
-    <tr>
-     <td>{t}Network address{/t}{$must}</td>
-     <td>
-{render acl=$acl}
-    <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'>
-{/render}
-  </td>
-    </tr>
-    <tr>
-     <td>{t}Netmask{/t}{$must}</td>
-     <td>
-{render acl=$acl}
-    <input type='text' name='dhcp_netmask' size='25' maxlength='80' value='{$dhcp_netmask}'>
-{/render}
-  </tr>
-   </table>
-  </td>
-  <td style='vertical-align:top'>
-   <table>
-    <tr>
-     <td>
-{render acl=$acl}
-    <input type="checkbox" name="use_range" value="1"
-      onChange="changeState('range_start');changeState('range_stop');" {$use_range}></td>
-{/render}
-     <td>{t}Range for dynamic address assignment{/t}</td>
-  </tr>
-  <tr>
-  <td>&nbsp;</td>
-  <td>
-{render acl=$acl}
-  <input type='text' id='range_start' name='range_start' size='25' maxlength='80' value='{$range_start}' {$range_disabled}>
-{/render}
-  &nbsp;<b>-</b>&nbsp;
-{render acl=$acl}
-  <input type='text' id='range_stop' name='range_stop' size='25' maxlength='80' value='{$range_stop}' {$range_disabled}>
-{/render}
-  </td>
-  </tr>
-  </table>
-  </td>
-  </tr>
-</table>
-<input type='hidden' name='dhcp_subnet_posted' value='1'>
-<p class="seperator"></p>
-
-<!-- Place cursor in correct field -->
-<script type="text/javascript">
-  <!-- // First input field on page
-   focus_field('cn');
-  -->
-</script>
diff --git a/dhcp/admin/systems/services/dhcp/dhcp_tsigkey.tpl b/dhcp/admin/systems/services/dhcp/dhcp_tsigkey.tpl
deleted file mode 100644
index a5e1c8a6db..0000000000
--- a/dhcp/admin/systems/services/dhcp/dhcp_tsigkey.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{* FusionDirectory dhcp host - smarty template *}
-<h3>{t}DNS update key{/t}</h3>
-
-<table width="100%">
- <tr>
-  <td>{t}Key name{/t}{$must}</td>
-  <td>
-   <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
-          title='{t}Name of Key{/t}'>
-  </td>
- </tr>
- <tr>
-  <td>{t}Encryption method{/t}</td>
-  <td>
-   <select name='dhcpKeyAlgorithm'>
-    {html_options options=$dhcpKeyAlgorithms selected=$dhcpKeyAlgorithm}
-   </select>
-  </td>
- </tr>
- <tr>
-  <td>{t}Key{/t}{$must}</td>
-  <td>
-   <input  type='text' name='dhcpKeySecret' size='30' maxlength='80' value='{$dhcpKeySecret}'>
-  </td>
- </tr>
-</table>
-
-<input type='hidden' name='dhcp_tsigkey_posted' value='1'>
-
-<p class="seperator"></p>
-
-<!-- Place cursor in correct field -->
-<script type="text/javascript">
-  <!-- // First input field on page
-  focus_field('cn');
-  -->
-</script>
diff --git a/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl b/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl
deleted file mode 100644
index d174f234ff..0000000000
--- a/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div style="font-size:18px;">
-<img alt="" src="geticon.php?context=status&icon=dialog-warning&size=32" align=top>&nbsp;{t}Warning{/t}
-</div>
-<p>
- {$warning}
- {t}This includes 'all' DHCP subsections that are located within this section. Please double check if your really want to do this since there is no way for FusionDirectory to get your data back.{/t}
-</p>
-
-<p>
- {t}Best thing to do before performing this action would be to save the current contents of your LDAP tree in a file. So - if you've done so - press 'Delete' to continue or 'Cancel' to abort.{/t}
-</p>
-
-<p class="plugbottom">
-  <input type=submit name="delete_dhcp_confirm" value="{msgPool type=delButton}">
-  &nbsp;
-  <input type=submit name="cancel_section" value="{msgPool type=cancelButton}">
-</p>
diff --git a/dhcp/admin/systems/services/dhcp/serviceDHCP.tpl b/dhcp/admin/systems/services/dhcp/serviceDHCP.tpl
deleted file mode 100644
index 8fb53fa7b8..0000000000
--- a/dhcp/admin/systems/services/dhcp/serviceDHCP.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<table width="100%">
-<tr>
-    <td style="width:100%;vertical-align:top;">
-    <h2>{t}DHCP sections{/t}</h2>
-        {$DhcpList}
-    </td>
-</tr>
-</table>
-<p class='seperator'>&nbsp;</p>
-<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
-    <input type='submit' name='SaveService' value='{msgPool type=saveButton}'>
-    &nbsp;
-    <input type='submit' name='CancelService' value='{msgPool type=cancelButton}'>
-</div
diff --git a/dhcp/config/dhcp/class_dhcpConfig.inc b/dhcp/config/dhcp/class_dhcpConfig.inc
new file mode 100644
index 0000000000..639247aca8
--- /dev/null
+++ b/dhcp/config/dhcp/class_dhcpConfig.inc
@@ -0,0 +1,53 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2015-2016 FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpConfig extends simplePlugin
+{
+  var $objectclasses  = array('fdDhcpPluginConf');
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP configuration'),
+      'plDescription'   => _('FusionDirectory dhcp plugin configuration'),
+      'plCategory'      => array('configuration'),
+      'plObjectType'    => array('smallConfig'),
+
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('DHCP config'),
+        'attrs' => array(
+          new StringAttribute (
+            _('DHCP RDN'), _('Branch in which DHCP configurations will be stored'),
+            'fdDhcpRDN', TRUE,
+            'ou=dhcp'
+          ),
+        )
+      ),
+    );
+  }
+}
+?>
diff --git a/dhcp/contrib/openldap/dhcp-fd-conf.schema b/dhcp/contrib/openldap/dhcp-fd-conf.schema
new file mode 100644
index 0000000000..c39c36bef2
--- /dev/null
+++ b/dhcp/contrib/openldap/dhcp-fd-conf.schema
@@ -0,0 +1,18 @@
+##
+## dhcp-fd.schema - Needed by Fusion Directory for managing DHCP
+##
+
+# Attributes
+attributetype ( 1.3.6.1.4.1.38414.57.1.1 NAME 'fdDhcpRDN'
+  DESC 'FusionDirectory - DHCP RDN'
+  EQUALITY caseExactIA5Match
+  SUBSTR caseExactIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE)
+
+# Object Class
+objectclass ( 1.3.6.1.4.1.38414.57.2.1 NAME 'fdDhcpPluginConf'
+  DESC 'FusionDirectory dhcp plugin configuration'
+  SUP top AUXILIARY
+  MUST ( cn )
+  MAY ( fdDhcpRDN ) )
diff --git a/dhcp/contrib/openldap/dhcp.schema b/dhcp/contrib/openldap/dhcp.schema
new file mode 100644
index 0000000000..c5ed6c723a
--- /dev/null
+++ b/dhcp/contrib/openldap/dhcp.schema
@@ -0,0 +1,462 @@
+attributetype ( 2.16.840.1.113719.1.203.4.1 
+	NAME 'dhcpPrimaryDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The DN of the dhcpServer which is the primary server for the configuration.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.2 
+	NAME 'dhcpSecondaryDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The DN of dhcpServer(s) which provide backup service for the configuration.'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.3 
+	NAME 'dhcpStatements' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'Flexible storage for specific data depending on what object this exists in. Like conditional statements, server parameters, etc. This allows the standard to evolve without needing to adjust the schema.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.4 
+	NAME 'dhcpRange' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'The starting & ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen.  Each range is defined as a separate value.'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.5 
+	NAME 'dhcpPermitList' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.6 
+	NAME 'dhcpNetMask' 
+	EQUALITY integerMatch
+	DESC 'The subnet mask length for the subnet.  The mask can be easily computed from this length.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.7 
+	NAME 'dhcpOption' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'Encoded option values to be sent to clients.  Each value represents a single option and contains (OptionTag, Length, OptionValue) encoded in the format used by DHCP.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.8 
+	NAME 'dhcpClassData' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'Encoded text string or list of bytes expressed in hexadecimal, separated by colons.  Clients match subclasses based on matching the class data with the results of match or spawn with statements in the class name declarations.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.9 
+	NAME 'dhcpOptionsDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The distinguished name(s) of the dhcpOption objects containing the configuration options provided by the server.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.10 
+	NAME 'dhcpHostDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'the distinguished name(s) of the dhcpHost objects.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) 
+
+attributetype ( 2.16.840.1.113719.1.203.4.11 
+	NAME 'dhcpPoolDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The distinguished name(s) of pools.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.12 
+	NAME 'dhcpGroupDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The distinguished name(s)   of the groups.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.13 
+	NAME 'dhcpSubnetDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The distinguished name(s) of the subnets.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.14 
+	NAME 'dhcpLeaseDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The distinguished name of a client address.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE)
+
+attributetype ( 2.16.840.1.113719.1.203.4.15 
+	NAME 'dhcpLeasesDN' 
+	DESC 'The distinguished name(s) client addresses.' 
+	EQUALITY distinguishedNameMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.16 
+	NAME 'dhcpClassesDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The distinguished name(s) of a class(es) in a subclass.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.17 
+	NAME 'dhcpSubclassesDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The distinguished name(s) of subclass(es).' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.18 
+	NAME 'dhcpSharedNetworkDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The distinguished name(s) of sharedNetworks.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.19 
+	NAME 'dhcpServiceDN' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The DN of dhcpService object(s)which contain the configuration information. Each dhcpServer object has this attribute identifying the DHCP configuration(s) that the server is associated with.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.20 
+	NAME 'dhcpVersion'
+	DESC 'The version attribute of this object.'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.21 
+	NAME 'dhcpImplementation' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'Description of the DHCP Server implementation e.g. DHCP Servers vendor.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.22 
+	NAME 'dhcpAddressState' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'This stores information about the current binding-status of an address.  For dynamic addresses managed by DHCP, the values should be restricted to the following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET", "ABANDONED", "BACKUP".  For other addresses, it SHOULD be one of the following: "UNKNOWN", "RESERVED" (an address that is managed by DHCP that is reserved for a specific client), "RESERVED-ACTIVE" (same as reserved, but address is currently in use), "ASSIGNED" (assigned manually or by some other mechanism), "UNASSIGNED", "NOTASSIGNABLE".'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.23 
+	NAME 'dhcpExpirationTime' 
+	EQUALITY generalizedTimeMatch 
+	DESC 'This is the time the current lease for an address expires.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.24 
+	NAME 'dhcpStartTimeOfState' 
+	EQUALITY generalizedTimeMatch 
+	DESC 'This is the time of the last state change for a leased address.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.25 
+	NAME 'dhcpLastTransactionTime' 
+	EQUALITY generalizedTimeMatch 
+	DESC 'This is the last time a valid DHCP packet was received from the client.'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.26 
+	NAME 'dhcpBootpFlag' 
+	EQUALITY booleanMatch 
+	DESC 'This indicates whether the address was assigned via BOOTP.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.27 
+	NAME 'dhcpDomainName' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'This is the name of the domain sent to the client by the server.  It is essentially the same as the value for DHCP option 15 sent to the client, and represents only the domain - not the full FQDN.  To obtain the full FQDN assigned to the client you must prepend the "dhcpAssignedHostName" to this value with a ".".' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.28 
+	NAME 'dhcpDnsStatus' 
+	EQUALITY integerMatch
+	DESC 'This indicates the status of updating DNS resource records on behalf of the client by the DHCP server for this address.  The value is a 16-bit bitmask.'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.29 
+	NAME 'dhcpRequestedHostName' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'This is the hostname that was requested by the client.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.30 
+	NAME 'dhcpAssignedHostName' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'This is the actual hostname that was assigned to a client. It may not be the name that was requested by the client.  The fully qualified domain name can be determined by appending the value of "dhcpDomainName" (with a dot separator) to this name.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.31 
+	NAME 'dhcpReservedForClient' 
+	EQUALITY distinguishedNameMatch
+	DESC 'The distinguished name of a "dhcpClient" that an address is reserved for.  This may not be the same as the "dhcpAssignedToClient" attribute if the address is being reassigned but the current lease has not yet expired.'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.32 
+	NAME 'dhcpAssignedToClient' 
+	EQUALITY distinguishedNameMatch
+	DESC 'This is the distinguished name of a "dhcpClient" that an address is currently assigned to.  This attribute is only present in the class when the address is leased.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.33 
+	NAME 'dhcpRelayAgentInfo' 
+	EQUALITY octetStringMatch
+	DESC 'If the client request was received via a relay agent, this contains information about the relay agent that was available from the DHCP request.  This is a hex-encoded option value.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.34 
+	NAME 'dhcpHWAddress' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'The clients hardware address that requested this IP address.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.35 
+	NAME 'dhcpHashBucketAssignment' 
+	EQUALITY octetStringMatch
+	DESC 'HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074].' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.36 
+	NAME 'dhcpDelayedServiceParameter' 
+	EQUALITY integerMatch
+	DESC 'Delay in seconds corresponding to Delayed Service Parameter configuration, as defined in  DHC Load Balancing Algorithm [RFC 3074]. '
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.37 
+	NAME 'dhcpMaxClientLeadTime' 
+	EQUALITY integerMatch
+	DESC 'Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.38 
+	NAME 'dhcpFailOverEndpointState' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR]' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.39 
+	NAME 'dhcpErrorLog' 
+	EQUALITY caseIgnoreIA5Match
+	DESC 'Generic error log attribute that allows logging error conditions within a dhcpService or a dhcpSubnet, like no IP addresses available for lease.'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.40 
+	NAME 'dhcpLocatorDN' 
+	EQUALITY distinguishedNameMatch 
+	DESC 'The DN of dhcpLocator object which contain the DNs of all DHCP configuration objects. There will be a single dhcpLocator object in the tree with links to all the DHCP objects in the tree' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype  ( 2.16.840.1.113719.1.203.4.41 
+	NAME 'dhcpKeyAlgorithm' 
+	EQUALITY caseIgnoreIA5Match 
+	DESC 'Algorithm to generate TSIG Key' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype  ( 2.16.840.1.113719.1.203.4.42 
+	NAME 'dhcpKeySecret' 
+	EQUALITY octetStringMatch 
+	DESC 'Secret to generate TSIG Key' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.43 
+	NAME 'dhcpDnsZoneServer' 
+	EQUALITY caseIgnoreIA5Match 
+	DESC 'Master server of the DNS Zone' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.44 
+	NAME 'dhcpKeyDN' 
+	EQUALITY distinguishedNameMatch 
+	DESC 'The DNs of TSIG Key to use in secure dynamic updates. In case of locator object, this will be list of TSIG keys.  In case of DHCP Service, Shared Network, Subnet and DNS Zone, it will be a single key.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
+
+attributetype ( 2.16.840.1.113719.1.203.4.45 
+	NAME 'dhcpZoneDN' 
+	EQUALITY distinguishedNameMatch 
+	DESC 'The DNs of DNS Zone. In case of locator object, this will be list of DNS Zones in the tree. In case of DHCP Service, Shared Network and Subnet, it will be a single DNS Zone.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
+
+attributetype ( 2.16.840.1.113719.1.203.4.46 
+	NAME 'dhcpFailOverPrimaryServer' 
+	EQUALITY caseIgnoreIA5Match 
+	DESC 'IP address or DNS name of the server playing primary role in DHC Load Balancing and Fail over.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26  )
+
+attributetype ( 2.16.840.1.113719.1.203.4.47 
+	NAME 'dhcpFailOverSecondaryServer' 
+	EQUALITY caseIgnoreIA5Match 
+	DESC 'IP address or DNS name of the server playing secondary role in DHC Load Balancing and Fail over.' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26  )
+
+attributetype ( 2.16.840.1.113719.1.203.4.48
+	NAME 'dhcpFailOverPrimaryPort' 
+	EQUALITY integerMatch 
+	DESC 'Port on which primary server listens for connections from its fail over peer (secondary server)' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
+	
+attributetype ( 2.16.840.1.113719.1.203.4.49
+	NAME 'dhcpFailOverSecondaryPort' 
+	EQUALITY integerMatch 
+	DESC 'Port on which secondary server listens for connections from its fail over peer (primary server)' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
+
+attributetype ( 2.16.840.1.113719.1.203.4.50
+	NAME 'dhcpFailOverResponseDelay' 
+	EQUALITY integerMatch 
+	DESC 'Maximum response time in seconds, before Server assumes that connection to fail over peer has failed' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
+
+attributetype ( 2.16.840.1.113719.1.203.4.51
+	NAME 'dhcpFailOverUnackedUpdates' 
+	EQUALITY integerMatch 
+	DESC 'Number of BNDUPD messages that server can send before it receives BNDACK from its fail over peer' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
+
+attributetype ( 2.16.840.1.113719.1.203.4.52
+	NAME 'dhcpFailOverSplit' 
+	EQUALITY integerMatch 
+	DESC 'Split between the primary and secondary servers for fail over purpose' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
+
+attributetype ( 2.16.840.1.113719.1.203.4.53
+	NAME 'dhcpFailOverLoadBalanceTime' 
+	EQUALITY integerMatch 
+	DESC 'Cutoff time in seconds, after which load balance is disabled' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
+
+attributetype ( 2.16.840.1.113719.1.203.4.54
+	NAME 'dhcpFailOverPeerDN' 
+	EQUALITY distinguishedNameMatch 
+	DESC 'The DNs of Fail over peers. In case of locator object, this will be list of fail over peers in the tree. In case of Subnet and pool, it will be a single Fail Over Peer' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) 
+
+#List of all servers in the tree
+attributetype ( 2.16.840.1.113719.1.203.4.55
+	NAME 'dhcpServerDN' 
+	EQUALITY distinguishedNameMatch 
+	DESC 'List of all  DHCP Servers in the tree. Used by dhcpLocatorObject' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.56
+	NAME 'dhcpComments' 
+	EQUALITY caseIgnoreIA5Match 
+	DESC 'Generic attribute that allows coments  within any DHCP object' 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+# Classes
+
+objectclass ( 2.16.840.1.113719.1.203.6.1 
+	NAME 'dhcpService' 
+	DESC 'Service object that represents the actual DHCP Service configuration. This is a container object.' 
+	SUP top 
+	MUST (cn) 
+	MAY ( dhcpPrimaryDN $ dhcpSecondaryDN $ dhcpServerDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpGroupDN $ dhcpHostDN $  dhcpClassesDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpKeyDN $ dhcpFailOverPeerDN $ dhcpStatements $dhcpComments $ dhcpOption) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.2 
+	NAME 'dhcpSharedNetwork' 
+	DESC 'This stores configuration information for a shared network.' 
+	SUP top 
+	MUST cn 
+	MAY ( dhcpSubnetDN $ dhcpPoolDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpStatements $dhcpComments $ dhcpOption) X-NDS_CONTAINMENT ('dhcpService' ) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.3 
+	NAME 'dhcpSubnet' 
+	DESC 'This class defines a subnet. This is a container object.' 
+	SUP top 
+	MUST ( cn $ dhcpNetMask ) 
+	MAY ( dhcpRange $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $ dhcpClassesDN $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpKeyDN $ dhcpFailOverPeerDN $ dhcpStatements $ dhcpComments $ dhcpOption ) X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.4 
+	NAME 'dhcpPool' 
+	DESC 'This stores configuration information about a pool.' 
+	SUP top 
+	MUST ( cn $ dhcpRange ) 
+	MAY ( dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $dhcpKeyDN $ dhcpStatements $ dhcpComments $ dhcpOption ) 
+	X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.5 
+	NAME 'dhcpGroup' 
+	DESC 'Group object that lists host DNs and parameters. This is a container object.' 
+	SUP top 
+	MUST cn 
+	MAY ( dhcpHostDN $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption )
+	X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpService' ) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.6 
+	NAME 'dhcpHost' 
+	DESC 'This represents information about a particular client' 
+	SUP top 
+	MUST cn 
+	MAY  (dhcpLeaseDN $ dhcpHWAddress $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption) 
+	X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' 'dhcpGroup') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.7 
+	NAME 'dhcpClass' 
+	DESC 'Represents information about a collection of related clients.' 
+	SUP top 
+	MUST cn 
+	MAY (dhcpSubClassesDN $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption) 
+	X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' ) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.8 
+	NAME 'dhcpSubClass' 
+	DESC 'Represents information about a collection of related classes.' 
+	SUP top 
+	MUST cn 
+	MAY (dhcpClassData $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption) X-NDS_CONTAINMENT 'dhcpClass' )
+
+objectclass ( 2.16.840.1.113719.1.203.6.9 
+	NAME 'dhcpOptions' 
+	DESC 'Represents information about a collection of options defined.' 
+	SUP top AUXILIARY
+	MUST cn 
+	MAY ( dhcpOption $ dhcpComments ) 
+	X-NDS_CONTAINMENT  ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet' 'dhcpPool' 'dhcpGroup' 'dhcpHost' 'dhcpClass' ) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.10 
+	NAME 'dhcpLeases' 
+	DESC 'This class represents an IP Address, which may or may not have been leased.' 
+	SUP top 
+	MUST ( cn $ dhcpAddressState ) 
+	MAY ( dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress ) 
+	X-NDS_CONTAINMENT ( 'dhcpService' 'dhcpSubnet' 'dhcpPool') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.11 
+	NAME 'dhcpLog' 
+	DESC 'This is the object that holds past information about the IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released.' 
+	SUP top 
+	MUST ( cn ) 
+	MAY ( dhcpAddressState $ dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress $ dhcpErrorLog) 
+	X-NDS_CONTAINMENT ('dhcpLeases' 'dhcpPool' 'dhcpSubnet' 'dhcpSharedNetwork' 'dhcpService' ) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.12 
+	NAME 'dhcpServer' 
+	DESC 'DHCP Server Object' 
+	SUP top 
+	MUST ( cn ) 
+	MAY (dhcpServiceDN  $ dhcpLocatorDN $ dhcpVersion $ dhcpImplementation $ dhcpHashBucketAssignment $ dhcpDelayedServiceParameter $ dhcpMaxClientLeadTime $ dhcpFailOverEndpointState $ dhcpStatements $ dhcpComments $ dhcpOption) 
+	X-NDS_CONTAINMENT ('organization' 'organizationalunit' 'domain') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.13 
+	NAME 'dhcpTSigKey' 
+	DESC 'TSIG key for secure dynamic updates' 
+	SUP top 
+	MUST (cn $ dhcpKeyAlgorithm $ dhcpKeySecret ) 
+	MAY ( dhcpComments ) 
+	X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.14 
+	NAME 'dhcpDnsZone' 
+	DESC 'DNS Zone for updating leases' 
+	SUP top 
+	MUST (cn $ dhcpDnsZoneServer ) 
+	MAY (dhcpKeyDN $ dhcpComments) 
+	X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.15 
+	NAME 'dhcpFailOverPeer' 
+	DESC 'This class defines the Fail over peer' 
+	SUP top 
+  MUST ( cn $ dhcpFailOverPrimaryServer $ dhcpFailOverSecondaryServer $ dhcpFailoverPrimaryPort $ dhcpFailOverSecondaryPort) MAY (dhcpFailOverResponseDelay  $ dhcpFailOverUnackedUpdates $ dhcpMaxClientLeadTime $ dhcpFailOverSplit $ dhcpHashBucketAssignment $ dhcpFailOverLoadBalanceTime $ dhcpComments ) 
+	X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.16 
+	NAME 'dhcpLocator' 
+	DESC 'Locator object for DHCP configuration in the tree. There will be a single dhcpLocator object in the tree with links to all the DHCP objects in the tree' 
+	SUP top 
+	MUST ( cn ) 
+	MAY ( dhcpServiceDN $dhcpServerDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $  dhcpClassesDN $ dhcpKeyDN $ dhcpZoneDN $ dhcpFailOverPeerDN $ dhcpOption $ dhcpComments) 
+	X-NDS_CONTAINMENT ('organization' 'organizationalunit' 'domain') )
+
+
diff --git a/dhcp/locale/ar/fusiondirectory.po b/dhcp/locale/ar/fusiondirectory.po
index 603f03e309..3b0106bc49 100644
--- a/dhcp/locale/ar/fusiondirectory.po
+++ b/dhcp/locale/ar/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "خطأ"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "تلقائي"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "الإسم"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "الإسم"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "خطأ"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "مجموعة"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "تحذير"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/ca/fusiondirectory.po b/dhcp/locale/ca/fusiondirectory.po
index 44961232f4..8905405638 100644
--- a/dhcp/locale/ca/fusiondirectory.po
+++ b/dhcp/locale/ca/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Nom"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Nom"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Error"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Error d'LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Genèric"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Avís"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/cs_CZ/fusiondirectory.po b/dhcp/locale/cs_CZ/fusiondirectory.po
index 98ef7b1f38..1d1d4767e6 100644
--- a/dhcp/locale/cs_CZ/fusiondirectory.po
+++ b/dhcp/locale/cs_CZ/fusiondirectory.po
@@ -1,579 +1,348 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Chyba"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr "Automaticky vytvářená oznámení nelze mazat!"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automaticky"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Název"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Adresní rozsah"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr "Rozsah nespadá do nastavené sítě."
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Síťová adresa"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Síťová maska"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
-msgstr "Rozsah sítě"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr "DNS zóna"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "DNS server"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
-msgstr "Rozlišený název klíče"
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
+msgstr "DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr "FDDI"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
-msgstr "Token Ring"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
-msgstr "Fyzická adresa zařízení (MAC)"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
-msgstr "Zápůjční doba"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
-msgstr "nejdelší výpůjční doba"
+#: 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
-msgstr "Výchozí výpůjční doba"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "služba DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
-msgstr "nejdelší výpůjční doba"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "spustit službu"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "zastavit službu"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "restartovat službu"
+
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Rozšířit DHCP podsíť"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr "Rozbalit"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr "Sbalit DHCP podsíť"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr "Sbalit"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
-msgstr "Vložit novou DHCP sekci"
+msgstr "vložit novou DHCP sekci"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "název"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
-msgstr "Celkové předvolby"
+msgstr "globální volby"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "chyba"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "Nastavení DHCP jsou neznámá. Kontaktujte svého správce systémů."
+msgstr ""
+"Nastavení DHCP jsou neznámá. Kontaktujte prosím svého správce systémů."
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
-msgstr "Sekce DHCP"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr "Nastavení DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
-msgstr "DN objektu dhcpService, který obsahuje informace o nastavení"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr "DHCP sekce, obsluhovaná tímto serverem"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr "Služba DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Spustit službu"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Zastavit službu"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Restartovat službu"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
-msgstr "Protokolování"
+msgstr "pořizování protokolovacích záznamů (logů)"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
-msgstr "Třída"
+msgstr "třída"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
-msgstr "Podtřída"
+msgstr "podtřída"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
-msgstr "Počítač"
+msgstr "stroj"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "skupina"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "rozsah"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
-msgstr "Podsíť"
+msgstr "podsíť"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
-msgstr "Protějšek, který převezme služby v případě selhání"
+msgstr "záložní server"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
-msgstr "Sdílená síť"
+msgstr "sdílená síť"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr "klíč pro aktualizaci DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr "zóny aktualizace DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Chyba LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr "Všesměrové vysílání (broadcast)"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr "Chyba v definici %s!"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr "Název klíče"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr "Klíč"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr "Nejdelší výpůjční doba"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr "Nejkratší výpůjční doba"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Obecné"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr "Název skupiny"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr "Autoritativní služba"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr "Průběžná aktualizace DNS"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr "Způsob průběžné aktualizace DNS"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr "Výchozí výpůjční doba (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr "Zadejte výchozí výpůjční dobu v sekundách."
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr "Nejdelší výpůjční doba (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr "Zadejte nejdelší výpůjční dobu v sekundách."
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr "Nastavení sítě"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
-msgstr "Směrovač"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
-msgstr "Zadejte název nebo IP adresu směrovače, který bude použit pro tuto sekci"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
-msgstr "Zavedení systému"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Název souboru"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
-msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr "Zadejte název souboru, který bude nahrán (přes TFTP protokol) na klienta poté, co bude zapnut"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr "Následující server"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr "Zadejte název serveru, ze kterého budou získávány zaváděcí obrazy"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr "Doménová jmenná služba (DNS)"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Doména"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr "Název domény"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr "Seznam DNS serverů, které budou propagovány"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr "DNS sever, který má být přidán"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr "Zvolené servery přidáte na seznam kliknutím sem"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "Zvolené servery odeberete ze seznamu kliknutím sem"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "Možnosti doménové jmenné služby (DNS)"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr "Přiřazovat názvy počítačů nalezené pomocí obráceného mapování"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr "Přiřazovat názvy strojů z jejich deklarací"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Rozsah adres, které budou přidělovány dynamicky"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "volby"
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "Zóna aktualizace DNS"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Varování"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr "Týká se všech podsekcí této sekce DHCP. Velmi dobře si rozmyslete, zda to skutečně chcete udělat – provedené změny pak FusionDirectory už nemůže vrátit zpět!"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "Před provedením této akce by bylo nejlepší uložit současnou podobu stromu LDAP do souboru. Pokud jste tak již učinili, klikněte na Smazat – v opačném případě celou akci zrušte kliknutím na Zrušit."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Název klíče"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Metoda šifrování"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "sekce"
 
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Název rozsahu"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr "Zvolte typ sekce, která má být vytvořena"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
 msgid "Create new DHCP section"
 msgstr "Vytvořit novou sekci DHCP"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr "Zvolte jeden z následujících typů sekce DHCP."
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Sekce"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Adresní rozsah"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Zvolte typ sekce, která má být vytvořena"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Vytvořit"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Skrýt pokročilá nastavení"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "Zprávy DHCP"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Volby DHCP"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Zobrazit pokročilá nastavení"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Síťová adresa"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Název stroje"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Neměnná (pevná) adresa"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr "Pro přiřazení neměnné IP adresy použijte DNS název nebo IP adresu"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Typ vybavení"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Název sdílené sítě"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Identifikátor serveru"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
-msgstr "Identifikátor propagovaného serveru pro tuto sdílenou síť"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr "Vyberte, zda je tento server pro tuto sdílenou síť autoritativním"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Autoritativní server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
+msgstr "FDDI"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Zápůjčky"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
+msgstr "Token Ring"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "sekund"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
+msgstr "Fyzická adresa zařízení (MAC)"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Nejkratší výpůjční doba"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Algoritmus"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Řízení přístupu"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "Vyberte, zda budou IP adresy poskytovány i neznámým strojům"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Povolit neznámé klienty"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
-msgstr "Vyberte, zda budou stroje, startující přes protokol bootp, dostávat dynamické IP adresy"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Zapnout podporu pro stroje startující protokolem bootp"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr "Vyberte, zda tento DHCP server bude ostatním strojům poskytovat zavádění jejich systému ze sítě"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Umožnit zavádění systému"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr ""
diff --git a/dhcp/locale/de/fusiondirectory.po b/dhcp/locale/de/fusiondirectory.po
index f867f4c9a8..3bd7723af4 100644
--- a/dhcp/locale/de/fusiondirectory.po
+++ b/dhcp/locale/de/fusiondirectory.po
@@ -1,580 +1,349 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
-# Maik Wagner <maikwagner@yahoo.com>, 2013
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Fehler"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr "Kann automatische Anweisungen nicht entfernen!"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automatisch"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Name"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Bereich"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr "Der Bereich befindet sich nicht innerhalb des konfigurierten Netzwerks."
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
+msgstr "DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Netzwerk-Adresse"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Netzmaske"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
-msgstr "Netzwerk-Bereich"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr "DNS-Zone"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "DNS-Server"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
-msgstr "Schlüssel-DN"
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr "FDDI"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
-msgstr "Token Ring"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
-msgstr "Hardware-Adresse"
+#: 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_dhcpService.inc:128
-msgid "Lease time"
-msgstr "Lease-Gültigkeit"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "DHCP Dienst"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
-msgstr "Max. Lease-Gültigkeit"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Dienst starten"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
-msgstr "Standard Lease-Gültigkeit"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Dienst stoppen"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Dienst neustarten"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
-msgstr "Maximale Lease-Gültigkeit"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "DHCP Subnetz erweitern"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr "Ausklappen"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr "DHCP Subnetz verwerfen"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr "Füge neue DHCP-Sektion ein"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Name"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr "Globale Optionen"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Fehler"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren System-Administrator."
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
-msgstr "DHCP-Sektionen"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+msgstr ""
+"Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren "
+"System-Administrator."
+
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr "DHCP-Konfiguration"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr "DHCP Dienst"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Dienst starten"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Dienst stoppen"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Dienst neustarten"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr "Protokollierung"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "System"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Vorrat"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnetz"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr "Host für Ausfallsicherung"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr "Verteiltes Netzwerk"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr "DNS-Update-Schlüssel"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr "DNS-Update-Zonen"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "LDAP-Fehler"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr "Broadcast"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr "Fehler in Definition von '%s'!"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr "Schlüssel-Name"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr "Schlüssel"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr "Max. Lease-Gültigkeit"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr "Min. Lease-Gültigkeit"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Allgemein"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr "Name der Gruppe"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr "Authoritativer Dienst"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr "Dynamische DNS-Updates"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr "Stil für Dynamische DNS-Updates"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr "Standard Lease-Gültigkeit (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr "Geben Sie die Standard Lease-Gültigkeit in Sekunden ein."
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr "Maximale Lease-Gültigkeit (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr "Geben Sie die maximale Lease-Gültigkeit in Sekunden ein."
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr "Netzwerk-Konfiguration"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
-msgstr "Router"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
-msgstr "Geben Sie den Namen oder die IP-Adresse des Routers ein, der in dieser Sektion verwendet werden soll"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
-msgstr "Bootup"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Dateiname"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
-msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr "Geben Sie den Namen der Datei ein, die via Tftp geladen werden soll, wenn der Client gestartet wurde"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr "Nächster Server"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr "Geben Sie den Namen des Servers ein, von dem Bootimages bezogen werden sollen"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr "Domain Name Service"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Domäne"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr "Name der Domäne"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr "Liste der DNS-Server die verbreitet werden soll"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr "DNS-Server, der hinzugefügt wird"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr "Klicken Sie hier um den gewählten Server zur Liste hinzuzufügen"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "licken Sie hier um den/die gewählten Server aus der Liste zu entfernen"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "Domain Name Service Optionen"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr "Weise Hostnamen zu die via Reverse Mapping gefunden wurden"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr "Weise Hostnamen aus Host-Deklarationen zu"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Bereich für dynamische Adresszuweisung"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "Optionen"
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "DNS-Update-Zone"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Warnung"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr "Dies umfasst 'alle' DHCP-Subsektionen die sich innerhalb dieser Sektion befinden. Bitte prüfen Sie genau, ob Sie dies wirklich wünschen, da es für FusionDirectory keine Möglichkeit gibt, die Daten wieder her zustellen."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "Eine Sicherung der LDAP-Datenbank bietet sich an dieser Stelle an. Wenn Sie dies erledigt haben, drücken Sie 'Entfernen' um Fortzufahren oder 'Abbrechen', um den Vorgang abzubrechen."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Name des Schlüssels"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Verschlüsselungsmethode"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Section"
 
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Name des Vorrats"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr "Wählen Sie den zu erzeugenden Sektions-Typ"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
 msgid "Create new DHCP section"
 msgstr "Erzeuge neue DHCP-Sektion"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr "Bitte verwenden Sie eine der folgenden Typen für DHCP-Sektionen."
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Section"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Bereich"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Wählen Sie den zu erzeugenden Sektions-Typ"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Anlegen"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Verstecke Erweiterte Einstellungen"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "DHCP-Anweisungen"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "DHCP-Optionen"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Zeige Erweiterte Einstellungen"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Netzwerk-Adresse"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Name des Hosts"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Feste Adresse"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr "Verwende Hostnamen oder IP-Adresse um eine feste Adresse zuzuweisen"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Hardware-Typ"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Name des Verteilten Netzwerks"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Serverbezeichnung"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
-msgstr "Öffentliche Serverbezeichnung für dieses Verteilte Netzwerk"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr "Auswählen, wenn dieser Server Authoritativ für dieses Verteilte Netzwerk ist"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Authoritativer Server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
+msgstr "FDDI"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
+msgstr "Token Ring"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "Sekunden"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
+msgstr "Hardware-Adresse"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Minimale Lease-Gültigkeit"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Algorithmus"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Zugriffssteuerung"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "Auswählen, wenn unbekannte Clients eine dynamische IP-Adresse erhalten sollen"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Erlaube unbekannte Clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
-msgstr "Auswählen, wenn Bootp Clients eine dynamische IP-Adresse erhalten sollen"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Erlaube Bootp Clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr "Auswählen, wenn Clients diesen DHCP-Server zum Booten verwenden dürfen"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Erlaube Booten"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr ""
diff --git a/dhcp/locale/el_GR/fusiondirectory.po b/dhcp/locale/el_GR/fusiondirectory.po
index bde9606a87..59465cc404 100644
--- a/dhcp/locale/el_GR/fusiondirectory.po
+++ b/dhcp/locale/el_GR/fusiondirectory.po
@@ -1,580 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Σφάλμα"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr "Αδυναμία διαγραφής αυτόματων statements!"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "αυτόματο"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Όνομα"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Εύρος"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr "Το 'εύρος' δεν είναι εντός του διαμορφωμένου δικτύου "
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Διεύθυνση δικτύου"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Μάσκα δικτύου"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
-msgstr "Εύρος δικτύου"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr "Ζώνη DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "Διακομιστής DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
-msgstr "Key DN"
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr "FDDI"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
-msgstr "Token Ring"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
-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_dhcpService.inc:128
-msgid "Lease time"
-msgstr "Χρόνος διατήρησης"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Υπηρεσία DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
-msgstr "Μέγιστος χρόνος διατήρησης"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Εκκίνηση υπηρεσίας"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
-msgstr "Προκαθορισμένος χρόνος διατήρησης"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Τερματισμός υπηρεσίας"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Επανεκκίνηση υπηρεσίας"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
-msgstr "Μέγιστος χρόνος διατήρησης"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Επέκταση του υποδικτύου DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr "Επέκταση"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr "Συρρίκνωση υποδικτύου DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr "Fold"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr "Εισαγωγή νέας ενότητας DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Όνομα"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr "Καθολικές επιλογές"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
-msgstr "Ενότητες DHCP"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr "Ρύθμιση DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr "Τα τμήματα του DHCP που διαχειρίζεται αυτός ο διακομιστής."
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr "Υπηρεσία DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Εκκίνηση υπηρεσίας"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Τερματισμός υπηρεσίας"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Επανεκκίνηση υπηρεσίας"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr "Καταγραφή"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "Class"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr "Subclass"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Όνομα συστήματος"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Ομάδα"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Ομάδα"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Υποδίκτυο"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr "Κοινόχρηστο  δίκτυο"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr "Κλειδί ενημέρωσης DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr "Ζώνες ενημέρωσης DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Σφάλμα LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr "Εκπομπή"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr "Σφάλμα στον ορισμό του '%s'!"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr "Όνομα κλειδιού"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr "Κλειδί"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr "Μέγιστος χρόνος διατήρησης"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr "Ελάχιστος χρόνος διατήρησης"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Γενικό"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr "Όνομα αμάδας"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr "Υπηρεσία πιστοποίησης"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr "Δυναμική ενημέρωση DNS"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr "Τρόπος δυναμικής ενημέρωσης του DNS"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr "Προκαθορισμένος χρόνος διατήρησης (δευτ.)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr "Εισάγετε τον προκαθορισμένο χρόνο διατήρησης σε δευτερόλεπτα."
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr "Μέγιστος χρόνος διατήρησης (δευτ.)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr "Εισάγετε τον μέγιστο χρόνο διατήρησης σε δευτερόλεπτα."
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr "Ρύθμιση δικτύου"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
-msgstr "Δρομολογητής"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
-msgstr "Εισάγετε το όνομα ή τη διεύθυνση δικτύου (IP) του δρομολογητή, ο οποίος θα χρησιμοποιηθεί σ'αυτή την ενότητα"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
-msgstr "Εκκίνηση"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Όνομα αρχείου"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
-msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr "Δώστε το όνομα του αρχείου που θα φορτωθεί μέσω TFTP, μετά την εκκινηση του υπολογιστή-πελάτη"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr "Επόμενος διακομιστής"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr " Επιλογές"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr "Δώστε το όνομα του διακομιστή, από τον οποίο θα ανακτηθεί το αρχείο εκκίνησης συστήματος"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr "Υπηρεσία ονομάτων Domain"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Τομέας"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr "Όνομα του τομέα"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr "Κατάλογος διακομιστών DNS, οι οποίοι θα αναπαραχθούν"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr "Διακομιστές DNS που θα προστεθούν"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Ενότητα"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr "Επιλέξτε εδώ για να προσθέσετε τον επιλεγμένο διακομιστή στον κατάλογο"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr "Επιλέξτε το είδος της ενότητας που θα δημιουργηθεί"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "Επιλέξτε εδώ για να αφαιρέσετε τον επιλεγμένο διακομιστή στον κατάλογο"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "Επιλογές DNS"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Εύρος"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "Ζώνη ανανέωσης DNS"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Προειδοποίηση"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Όνομα κλειδιού"
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Μέθοδος κρυπτογράφησης"
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Όνομα ομάδας"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Διεύθυνση δικτύου"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Ενότητα"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Επιλέξτε το είδος της ενότητας που θα δημιουργηθεί"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Δημιουργία"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Απόκρυψη προχωρημένων ρυθμίσεων"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Επιλογές DHCP"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Εμφάνιση προχωρημένων ρυθμίσεων"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Ονομασία φορέα (host)"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Μόνιμη διεύθυνση"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
+msgstr "FDDI"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Τύπος υλικού"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
+msgstr "Token Ring"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Ονομασία του κοινόχρηστου δικτύου"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
+msgstr "Διεύθυνση υλικού"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Αναγνωριστικό διακομιστή"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Αλγόριθμος"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Authoritative server"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "δευτερόλεπτα"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Ελάχιστο χρόνος διατήρησης"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Έλεγχος πρόσβασης"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "Επιλέξτε αν οι άγνωστοι πελάτες θα λαμβάνουν δυναμικές διευθύνσεις IP"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Να επιτρέπονται άγνωστοι πελάτες"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Να επιτρέπονται πελάτες bootp"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Να επιτρέπεται booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr ""
diff --git a/dhcp/locale/en/fusiondirectory.po b/dhcp/locale/en/fusiondirectory.po
index 3f0d59019c..58942b2c35 100644
--- a/dhcp/locale/en/fusiondirectory.po
+++ b/dhcp/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-10-15 16:47+0200\n"
+"POT-Creation-Date: 2016-10-15 18:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,562 +17,329 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
-msgid "Global options"
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-msgid ""
-"The DHCP configuration set is unkown. Please contact your system "
-"administrator."
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
+msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
-"The DN of dhcpService object which contain the configuration information"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
-msgid "The DHCP sections handled by this server"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
+"The DHCP configuration set is unkown. Please contact your system "
+"administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
+#: admin/dhcp/class_dhcpConfiguration.inc:492
+msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be "
+"specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
+"This attribute contains the permit lists associated with a pool. Each permit "
+"list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/es/fusiondirectory.po b/dhcp/locale/es/fusiondirectory.po
index a970ae9564..d280bec78a 100644
--- a/dhcp/locale/es/fusiondirectory.po
+++ b/dhcp/locale/es/fusiondirectory.po
@@ -1,578 +1,349 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 17:04+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Error"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr "¡No se puede eliminar informes automáticos!"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automático"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Nombre"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Rango"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr "El rango no está dentro de la red configurada."
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
+msgstr "DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Dirección de red"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Mascara de red"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
-msgstr "Rango de red"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr "Zona DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "Servidor DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
-msgstr "Llave DN"
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr "FDDI"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
-msgstr "Token Ring"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
-msgstr "Dirección hardware"
+#: 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_dhcpService.inc:128
-msgid "Lease time"
-msgstr "Tiempo de asignación"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Servicio DHCP"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Iniciar servicio"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
-msgstr "Tiempo de asignación máximo"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Parar servicio"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
-msgstr "Tiempo de asignación por omisión"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Reiniciar servicio"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
-msgstr "Tiempo de asignación máximo"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva sección DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Error"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "La configuración DHCP es desconocida. Contacte con su administrador de sistemas."
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
-msgstr "Secciones DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+msgstr ""
+"La configuración DHCP es desconocida. Contacte con su administrador de "
+"sistemas."
+
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr "Configuración DHCP"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr "Servicio DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Iniciar servicio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Parar servicio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Reiniciar servicio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "Clase"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr "Llave de actualización DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr "Zonas de actualización DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr "Dirección de difusión"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr "¡Error en la definición de '%s'!"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr "Nombre de la llave"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr "Llave"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr "Tiempo de asignación máximo"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr "Tiempo de asignación mínimo"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Genérico"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr "Nombre del grupo"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr "Servicio autorizado"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr "Actualización DNS dinámica"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr "Estilo de actualización DNS dinámica"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr "Tiempo de asignación por omisión (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr "Introduzca el Tiempo de asignación por omisión en segundos."
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr "Tiempo de asignación máximo (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr "Introduzca el Tiempo de asignación máximo en segundos."
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr "Configuración de red"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
-msgstr "Encaminador"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
-msgstr "Introduzca el nombre o la dirección del router seleccionado en esta sección"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
-msgstr "Bootup"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
-msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr "Introduzca el nombre del fichero que será cargado vía tftp despues de que el cliente haya iniciado"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr "Siguiente Servidor"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr "Introduzca el nombre del servidor para recuperar desde el la imágenes de inicio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr "Servicio de nombre de dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr "Nombre del dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr "Lista de servidores DNS para la propagación"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr "Servidor DNS que será añadido"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr "Pulse aquí para añadir el servidor seleccionado a la lista"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "Pulse aquí para eliminar los servidores seleccionados de la lista"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "Opciones del servicio de Nombres de Dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr "Asignar nombres de maquina encontrados a través de resolución inversa"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr "Asignar nombres de maquina a partir de las declaraciones de host"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Rango de asignación de direcciones dinámicas"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "Opciones"
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "Zona de actualización DNS"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr "Esto incluye 'todas' las subsecciones DHCP que están localizadas dentro de esta sección. Si está seguro de lo que quiere hacer pulse dos veces, ya que una vez hecho esto, no hay forma de que FusionDirectory recupere la información."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "La mejor opción antes de ejecutar esta acción es haber grabado el contenido actual de su árbol LDAP en un fichero. Entonces - Y solo entonces - presione 'Eliminar' para continuar o 'Cancelar' para abortar."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Nombre de la llave"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Método de encripción"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Sección"
 
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Nombre del Conjunto (Pool)"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr "Seleccione el tipo de sección para crear"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
 msgid "Create new DHCP section"
 msgstr "Crear una nueva sección DHCP"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr "Porfavor elija uno de los siguientes tipos de sección DHCP."
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Sección"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Rango"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Seleccione el tipo de sección para crear"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Crear"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Ocultar configuración avanzada"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "Informes DHCP"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Opciones DHCP"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Mostrar configuración avanzada"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Dirección de red"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Nombre de la máquina"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Dirección estática"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr "Usar nombre de máquina o dirección IP para asignar la dirección estática"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Tipo de hardware"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Nombre para la Red compartida"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Identificador de servidor"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
-msgstr "Identificador de servidor propagado para esta red compartida"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr "Selecciones si este servidor está autorizado para esta red compartida"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Servidor autorizado"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
+msgstr "FDDI"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Asignaciones"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
+msgstr "Token Ring"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "segundos"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
+msgstr "Dirección hardware"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Tiempo de asignación mínimo"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Control de acceso"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "Seleccione si clientes desconocidos deberían obtener direcciones IP"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Permitir clientes desconocidos"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
-msgstr "Seleccione si clientes BOOTP deberían obtener direcciones IP dinámicas"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Permitir clientes BOOTP"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr "Seleccione si los clientes van a poder iniciar usando este servidor DHCP"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Permitir inicialización"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr ""
diff --git a/dhcp/locale/es_CO/fusiondirectory.po b/dhcp/locale/es_CO/fusiondirectory.po
index e63a58ce0a..889231ab82 100644
--- a/dhcp/locale/es_CO/fusiondirectory.po
+++ b/dhcp/locale/es_CO/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automático"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Error"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Equipo"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "GRupo"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Precacuión"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Crear"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "segundos"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/es_VE/fusiondirectory.po b/dhcp/locale/es_VE/fusiondirectory.po
index 7cbd5dc353..0b7dae85e4 100644
--- a/dhcp/locale/es_VE/fusiondirectory.po
+++ b/dhcp/locale/es_VE/fusiondirectory.po
@@ -1,578 +1,349 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Error"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr "¡No se puede eliminar informes automáticos!"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automático"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Nombre"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Rango"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr "El rango no está dentro de la red configurada."
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
+msgstr "DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Dirección de red"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Mascara de red"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
-msgstr "Rango de red"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr "Zona DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "Servidor DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
-msgstr "Llave DN"
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr "FDDI"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
-msgstr "Token Ring"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
-msgstr "Dirección hardware"
+#: 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_dhcpService.inc:128
-msgid "Lease time"
-msgstr "Tiempo de asignación"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Servicio DHCP"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Iniciar servicio"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
-msgstr "Tiempo de asignación máximo"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Parar servicio"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
-msgstr "Tiempo de asignación por omisión"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Reiniciar servicio"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
-msgstr "Tiempo de asignación máximo"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Expandir subred DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva sección DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Error"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "La configuración DHCP es desconocida. Contacte con su administrador de sistemas."
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
-msgstr "Secciones DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+msgstr ""
+"La configuración DHCP es desconocida. Contacte con su administrador de "
+"sistemas."
+
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr "Configuración DHCP"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr "Servicio DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Iniciar servicio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Parar servicio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Reiniciar servicio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "Clase"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr "Llave de actualización DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr "Zonas de actualización DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Error de LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr "Dirección de difusión"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr "¡Error en la definición de '%s'!"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr "Nombre de la llave"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr "Llave"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr "Tiempo de asignación máximo"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr "Tiempo de asignación mínimo"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Genérico"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr "Nombre del grupo"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr "Servicio autorizado"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr "Actualización DNS dinámica"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr "Estilo de actualización DNS dinámica"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr "Tiempo de asignación por omisión (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr "Introduzca el Tiempo de asignación por omisión en segundos."
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr "Tiempo de asignación máximo (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr "Introduzca el Tiempo de asignación máximo en segundos."
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr "Configuración de red"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
-msgstr "Encaminador"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
-msgstr "Introduzca el nombre o la dirección del router seleccionado en esta sección"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
-msgstr "Bootup"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
-msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr "Introduzca el nombre del fichero que será cargado vía tftp despues de que el cliente haya iniciado"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr "Siguiente Servidor"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr "Introduzca el nombre del servidor para recuperar desde el la imágenes de inicio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr "Servicio de nombre de dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr "Nombre del dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr "Lista de servidores DNS para la propagación"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr "Servidor DNS que será añadido"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr "Pulse aquí para añadir el servidor seleccionado a la lista"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "Pulse aquí para eliminar los servidores seleccionados de la lista"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "Opciones del servicio de Nombres de Dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr "Asignar nombres de maquina encontrados a través de resolución inversa"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr "Asignar nombres de maquina a partir de las declaraciones de host"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Rango de asignación de direcciones dinámicas"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "Opciones"
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "Zona de actualización DNS"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr "Esto incluye 'todas' las subsecciones DHCP que están localizadas dentro de esta sección. Si está seguro de lo que quiere hacer pulse dos veces, ya que una vez hecho esto, no hay forma de que FusionDirectory recupere la información."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "La mejor opción antes de ejecutar esta acción es haber grabado el contenido actual de su árbol LDAP en un fichero. Entonces - Y solo entonces - presione 'Eliminar' para continuar o 'Cancelar' para abortar."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Nombre de la llave"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Método de encripción"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Sección"
 
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Nombre del Conjunto (Pool)"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr "Seleccione el tipo de sección para crear"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
 msgid "Create new DHCP section"
 msgstr "Crear una nueva sección DHCP"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr "Porfavor elija uno de los siguientes tipos de sección DHCP."
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Sección"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Rango"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Seleccione el tipo de sección para crear"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Crear"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Ocultar configuración avanzada"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "Informes DHCP"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Opciones DHCP"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Mostrar configuración avanzada"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Dirección de red"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Nombre de la máquina"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Dirección estática"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr "Usar nombre de máquina o dirección IP para asignar la dirección estática"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Tipo de hardware"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Nombre para la Red compartida"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Identificador de servidor"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
-msgstr "Identificador de servidor propagado para esta red compartida"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr "Selecciones si este servidor está autorizado para esta red compartida"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Servidor autorizado"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
+msgstr "FDDI"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Asignaciones"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
+msgstr "Token Ring"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "segundos"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
+msgstr "Dirección hardware"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Tiempo de asignación mínimo"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Control de acceso"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "Seleccione si clientes desconocidos deberían obtener direcciones IP"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Permitir clientes desconocidos"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
-msgstr "Seleccione si clientes BOOTP deberían obtener direcciones IP dinámicas"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Permitir clientes BOOTP"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr "Seleccione si los clientes van a poder iniciar usando este servidor DHCP"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Permitir inicialización"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr ""
diff --git a/dhcp/locale/fa_IR/fusiondirectory.po b/dhcp/locale/fa_IR/fusiondirectory.po
index 382d1b34f2..5a391d78de 100644
--- a/dhcp/locale/fa_IR/fusiondirectory.po
+++ b/dhcp/locale/fa_IR/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "خطا"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "خطا"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "خطای LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/fi_FI/fusiondirectory.po b/dhcp/locale/fi_FI/fusiondirectory.po
index 7e7bf44019..f5303ffc49 100644
--- a/dhcp/locale/fi_FI/fusiondirectory.po
+++ b/dhcp/locale/fi_FI/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:37+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Virhe"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Nimi"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Nimi"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Virhe"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "LDAP virhe"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Varoitus"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Luo"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/fr/fusiondirectory.po b/dhcp/locale/fr/fusiondirectory.po
index b464588c10..7778400502 100644
--- a/dhcp/locale/fr/fusiondirectory.po
+++ b/dhcp/locale/fr/fusiondirectory.po
@@ -1,580 +1,358 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Erreur"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
+"La configuration DHCP ou sous section dans lequel cet hôte doit être ajouté"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr "Impossible d’effacer les déclarations automatiques !"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automatique"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Nom"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr "L'adresse Mac à utiliser dans l'enregistrement d'hôte DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Intervalle"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr "L'adresse IP à utiliser dans l'enregistrement d'hôte DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr "L'intervalle réseau n'est pas compris dans le réseau configuré."
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
+msgstr "DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Adresse réseau"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
+msgstr "Modifier les zones DHCP d'un système"
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Masque réseau"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
-msgstr "Intervalle du réseau"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr "Zone DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "Serveur DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
-msgstr "DN de la clef"
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr "FDDI"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
+msgstr "Hôtes dhcp déclarés pour ce système"
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
-msgstr "Token Ring"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr "Configuration DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
-msgstr "Adresse matérielle"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
+msgstr ""
+"Le DN de(s) objet(s) dhcpService qui contiennent les informations de "
+"configuration"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Service DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
-msgstr "Bail"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Démarrer le service"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
-msgstr "Durée maximum du bail"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Arrêter le Service"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
-msgstr "Bail par défaut"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Redémarrer le service"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
-msgstr "Durée maximum du bail"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr "gestion DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Déplier le sous réseau"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr "Deplier"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr "Replier le sous réseau"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr "Replier"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr "Insérer une nouvelle section DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Nom"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr "Options globales"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Erreur"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "La configuration DHCP est inconnue. Veuillez contacter votre administrateur système."
+msgstr ""
+"La configuration DHCP est inconnue. Veuillez contacter votre administrateur "
+"système."
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
-msgstr "Sections DHCP"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr "Configuration DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
-msgstr "Le DN de l’objet dhcpService qui contient les informations de configuration"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
+msgstr "Objets dhcp"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr "Les sections DHCP gérées par ce serveur"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr "Service DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Démarrer le service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Arrêter le Service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Redémarrer le service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr "Journaux systèmes"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "Classe"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr "Sous classe"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Hôte"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
-msgstr "Groupe"
+msgstr "Groupes"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Réservoir"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Sous réseau"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr "Pair de reprise sur panne"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr "Réseau partagé"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr "Clef de mise à jour du DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr "Zones DNS à mettre à jour"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Erreur LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr "Broadcast"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr "Erreur lors de la définition de '%s' !"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr "Nom de la clef"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr "Clef"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr "Durée maximum du bail"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr "Durée minimum du bail"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Application"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr "Nom du groupe"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr "Service autoritaire"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr "Mise à jour dynamique du DNS"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr "Style de mise à jour dynamique du DNS"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr "Bail par défaut (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr "Entrer la durée par défaut du bail en secondes."
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr "Durée maximum du bail (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr "Entrer la durée maximum du bail en secondes."
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr "Configuration réseau"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
-msgstr "Routeur"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
-msgstr "Entrez le nom ou l'adresse IP du routeur qui doit être utilisé dans cette section"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
-msgstr "Démarrage"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Nom du fichier"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
-msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr "Entrez le nom du fichier qui doit être chargé via tftp après que le client ai démarré"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr "Serveur suivant"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr "Entrez le nom du serveur qui contient les images de démarrage"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr "Service de Nom de Domaine"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Domaine"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr "Nom du domaine"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr "Liste des serveurs DNS à propager"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr "Serveur DNS à ajouter"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr "Cliquez ici pour ajouter les serveurs sélectionnés à la liste"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "Cliquez ici pour enlever les serveurs sélectionnées de la liste"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
+msgstr "Nom de cette configuration DHCP"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "Options du serveur DNS"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "Options"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr "Assigner les noms trouvés avec un lookup inverse"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr "Options dhcp"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr "Attribuer les noms d'hôtes grâce aux déclarations des hôtes"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr "Directives"
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Intervalle pour l'affectation d'adresses dynamique"
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "Zone DNS à mettre à jour"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Avertissement"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr "Ceci inclut toutes les sous sections DHCP qui sont dans cette section. Veuillez vérifier que vous voulez effectuer cette opération, étant donné qu'il est impossible pour FusionDirectory de récupérer vos données."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr "Directives DHCP"
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "Il est conseillé de sauvegarder l'arbre de votre annuaire LDAP dans un fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour continuer ou 'Annuler' pour abandonner."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
+msgstr "Commentaire"
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Nom de la clef"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
+msgstr "Commentaire sur cet objet DHCP"
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Méthode de chiffrement"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Section"
 
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Nom du pool d'adresses"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr "Choisissez le type de section à créer"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
 msgid "Create new DHCP section"
 msgstr "Créer une nouvelle section DHCP"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr "Veuillez choisir un des types de section DHCP suivants."
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Section"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Intervalle"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Choisissez le type de section à créer"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+"Les adresses IP de départ et de fin dans la plage (inclues), séparés par un "
+"trait d'union; si la plage ne contient qu'une seule adresse, alors juste "
+"l'adresse peut être spécifiée sans trait d'union. Chaque plage est définie "
+"comme une valeur distincte."
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Créer"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Cacher la configuration avancée"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "Directives DHCP"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr "Taille du masque"
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Options DHCP"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+"La longueur du masque de sous-réseau pour le sous-réseau. Le masque peut "
+"être facilement calculé à partir de cette longueur."
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Afficher la configuration avancée"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Adresse réseau"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Nom de l'hôte"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr "Adresse réseau de ce sous-réseau"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Adresse fixe"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
+msgstr "Serveur DNS de la zone"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr "Utiliser le nom de l'hôte ou l'adresse IP pour assigner une adresse fixe"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
+msgstr "serveur maître de la zone DNS"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Type de matériel"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
+msgstr "Clé Tsig"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Nom du réseau partagé"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
+msgstr "Le DN de la clef Tsig"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Identifiant du serveur"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
+msgstr "Adresse mac du client"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
-msgstr "Identifiant de serveur propagé pour ce réseau partagé"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
+msgstr "Le type d'adresse matérielle"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr "Sélectionnez si ce serveur doit être autoritaire pour ce réseau"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Serveur autoritaire"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
+msgstr "FDDI"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Bail"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
+msgstr "Token Ring"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "secondes"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
+msgstr "Adresse matérielle"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Durée minimum du bail"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Algorithme"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Contrôle d'accès"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr "Algorithme pour générer la clé TSIG"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "Sélectionner si les clients inconnus doivent recevoir une adresse IP dynamique"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr "Secret"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Accepter les clients inconnus"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr "Secret pour générer TSIG Key"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
-msgstr "Sélectionner si les clients bootp doivent recevoir une adresse IP dynamique"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr "Configuration du plugin dhcp"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Accepter les clients bootp"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr "Configuration DHCP"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr "Sélectionner si les clients sont autorisés à démarrer en utilisant ce serveur DHCP"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr "Branche DHCP"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Permettre le démarrage"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr "Branches où seront stockées les configurations dhcp"
diff --git a/dhcp/locale/hu_HU/fusiondirectory.po b/dhcp/locale/hu_HU/fusiondirectory.po
index 12d31e3b6f..15c26dc409 100644
--- a/dhcp/locale/hu_HU/fusiondirectory.po
+++ b/dhcp/locale/hu_HU/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:37+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Név"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Név"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/id/fusiondirectory.po b/dhcp/locale/id/fusiondirectory.po
index b03d7b8cd0..dd7fbf0ccc 100644
--- a/dhcp/locale/id/fusiondirectory.po
+++ b/dhcp/locale/id/fusiondirectory.po
@@ -1,578 +1,346 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:37+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
-msgid "Global options"
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-msgid ""
-"The DHCP configuration set is unkown. Please contact your system "
-"administrator."
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
+msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
-"The DN of dhcpService object which contain the configuration information"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
-msgid "The DHCP sections handled by this server"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
+"The DHCP configuration set is unkown. Please contact your system "
+"administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
+#: admin/dhcp/class_dhcpConfiguration.inc:492
+msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/it_IT/fusiondirectory.po b/dhcp/locale/it_IT/fusiondirectory.po
index 5bfabffc3d..2483776675 100644
--- a/dhcp/locale/it_IT/fusiondirectory.po
+++ b/dhcp/locale/it_IT/fusiondirectory.po
@@ -1,580 +1,349 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <penati@avaya.com>, 2015
-# Paola Penati <penati@avaya.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-02 15:22+0000\n"
-"Last-Translator: Paola Penati <penati@avaya.com>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Errore"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr "Impossibile rimuovere le dichiarazioni automatiche !"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automatico"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Nome"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Intervallo (Range)"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr "\"L'intervallo\" non è compreso nella rete configurata. "
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
+msgstr "DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Indirizzo di rete"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Maschera di sottorete"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
-msgstr "Intervallo della  sottorete (Network range)"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr "Zona DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "Server DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
-msgstr "Key DN"
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr "FDDI"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
-msgstr "Token Ring"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
-msgstr "Indirizzo hardware"
+#: 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_dhcpService.inc:128
-msgid "Lease time"
-msgstr "Tempo di lease"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Servizio DHCP"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Avvia il servizio"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
-msgstr "Tempo di lease massimo"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Ferma il servizio"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
-msgstr "Tempo di lease di default"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Riavvia il servizio"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
-msgstr "Tempo di lease massimo"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Espandi la sottorete DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr "Espandere"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr "Ripiega la sottorete DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr "Piega"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr "Inserisci una nuova sezione DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Nome"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr "Opzioni globali"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Errore"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "La configurazione DHCP impostata è sconosciuta. Contatta l'amministratore del sistema."
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
-msgstr "Sezioni DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
-msgstr "DN di servizio DHCP che contiene le informazioni di configurazione"
+msgstr ""
+"La configurazione DHCP impostata è sconosciuta. Contatta l'amministratore "
+"del sistema."
+
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr "Configurazione del DHCP"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr "Sezioni DHCP gestite da questo server"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr "Servizio DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Avvia il servizio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Ferma il servizio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Riavvia il servizio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr "Giornale di sistema"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "Categoria"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr "Sottoclasse"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Gruppo"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Deposito"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Sottorete"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr "Partner per la presa di controllo"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr "Rete condivisa"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr "Stile di aggiornamento dinamico del DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr "Aggiornamento delle zone DNS"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Errore LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr "Indirizzo Broadcast"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr "Errore nella definizione di '%s' !"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr "Nome"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr "Key"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr "Tempo di lease massimo"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr "Tempo di lease minimo"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Informazioni"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr "Nome del gruppo"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr "Servizio autoritativo"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr "Aggiornamento dinamico del DNS"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr "Stile di aggiornamento dinamico del DNS"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr "Tempo di lease di default"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr "Immetti il tempo di lease di default, in secondi."
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr "Tempo di lease massimo"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr "Immetti il tempo di lease massimo in secondi."
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr "Configurazione della rete"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
-msgstr "Router"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
-msgstr "Inserisci il nome oppure l'indirizzo IP del router che sarà usato in questa sezione"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
-msgstr "Avvio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Nome del file"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
-msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr "Inserisci il nome del file che dovrà essere caricato attraverso il server tftp dopo l'avvio del client"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr "Server successivo"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr "Inserisci il nome del server che possiede le immagini di avvio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr "Servizio DNS"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr "Nome del dominio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr "Elenco dei server DNS che saranno replicati"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr "Server DNS da aggiungere"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr "Premi qui per poter aggiungere il server selezionato all'elenco"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "Premi qui per poter rimuovere il server selezionato dall'elenco"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "Opzioni del server DNS"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr "Assegna i nomi trovati attraverso la risoluzione DNS inversa"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr "Assegna i nomi a partire dalle dichiarazioni degli host"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Intervallo per l'assegnazione dinamica degli indirizzi"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "Opzioni"
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "Aggiornamento della zona DNS"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Avvertimento"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr "Questo include tutte le sotto-sezioni DHCP che fanno parte di questa sezione. Accertati che vuoi davvero eseguire questa azione visto che poi sarà impossibile per FusionDirectory recuperare i tuoi dati."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "La migliore cosa da fare, prima di eseguire questa azione, potrebbe essere quella di salvare l'attualecontenuto del tuo albero LDAP in un file. Quindi - se lo hai già fatto - premi'Cancella' per continuare altrimenti  'Annulla' per interrompere."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Nome dell'host"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Algoritmo di criptaggio"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Sezione"
 
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Nome del pool d'indirizzi"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr "Scegli il tipo di sezione da creare"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
 msgid "Create new DHCP section"
 msgstr "Crea una nuova sezione DHCP"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr "Scegli una delle seguenti sezioni DHCP."
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Sezione"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Intervallo (Range)"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Scegli il tipo di sezione da creare"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Crea"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Nascondi le impostazioni avanzate"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "Istruzioni DHCP"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Opzioni DHCP"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Mostra le opzioni avanzate"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Indirizzo di rete"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Nome dell'host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Indirizzo fisso"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr "Usa il nome dell'host (hostname) oppure l'indirizzo IP per assegnare un indirizzo fisso"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Tipo di materiale"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Nome della rete condivisa"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Identificativo del server"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
-msgstr "Identificativo del server replicato per questa rete condivisa"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr "Seleziona se il server dev'essere autoritativo per questa rete condivisa"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Server autoritativo"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
+msgstr "FDDI"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
+msgstr "Token Ring"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "secondi"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
+msgstr "Indirizzo hardware"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Tempo di lease minimo"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Algoritmo"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Controllo degli accessi"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "Scegli se i clienti sconosciuti dovrebbe ottenere gli indirizzi IP dinamici"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Accetta i client sconosciuti"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
-msgstr "Scegli se i client bootp dovrebbe ottenere gli indirizzi IP dinamici"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Accetta i client bootp"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr "Scegli se i client sono autorizzati a fare il boot usando il server DHCP"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Consenti l'Avvio"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr ""
diff --git a/dhcp/locale/lv/fusiondirectory.po b/dhcp/locale/lv/fusiondirectory.po
index 4a644a2605..1a8c826aba 100644
--- a/dhcp/locale/lv/fusiondirectory.po
+++ b/dhcp/locale/lv/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Kļūda"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Vārds "
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Vārds "
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Kļūda"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "LDAP kļūda"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Brīdinājums"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Izveidot"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/nb/fusiondirectory.po b/dhcp/locale/nb/fusiondirectory.po
index d39cb8924d..4b7a01ebdd 100644
--- a/dhcp/locale/nb/fusiondirectory.po
+++ b/dhcp/locale/nb/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Feil"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Navn"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Navn"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Feil"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Vert"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "LDAP-feil"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Generisk"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Opprett"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/nl/fusiondirectory.po b/dhcp/locale/nl/fusiondirectory.po
index 95e6e245f3..dae336561f 100644
--- a/dhcp/locale/nl/fusiondirectory.po
+++ b/dhcp/locale/nl/fusiondirectory.po
@@ -1,578 +1,349 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Fout"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr "Kan automatische regels niet verwijderen!"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automatisch"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Naam"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Reeks"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr "De reeks ligt niet binnen het geconfigureerde netwerk."
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
+msgstr "DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Netwerkadres"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Netmask"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
-msgstr "Netwerkreeks"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr "DNZ zone"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "DNS server"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
-msgstr "Sleutel DN"
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr "FDDI"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
-msgstr "Token ring"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
-msgstr "Hardware adres"
+#: 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_dhcpService.inc:128
-msgid "Lease time"
-msgstr "Leasetijd"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "DHCP service"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Start service"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
-msgstr "Maximale leasetijd"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Stop service"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
-msgstr "Standaard lease tijd"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Restart service"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
-msgstr "Maximale leasetijd"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Vergroot DHCP subnet"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr "Verklein DHCP subnet"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr "Voer nieuwe DHCP sectie in"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Naam"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr "Globale opties"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Fout"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "De ingestelde DHCP configuratie is onbekend. Neem contact op met uw systeembeheerder."
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
-msgstr "DHCP secties"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+msgstr ""
+"De ingestelde DHCP configuratie is onbekend. Neem contact op met uw "
+"systeembeheerder."
+
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr "DHCP configuratie"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr "DHCP service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Start service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Stop service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Restart service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr "Loggen"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Groep"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnet"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr "Gedeeld netwerk"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr "DNS update sleutel"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr "DNS update zones"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "LDAP fout"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr "Broadcast"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr "Fout in definitie van '%s'!"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr "Sleutelnaam"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr "Sleutel"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr "Maximale leasetijd"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr "Minimale leasetijd"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Algemeen"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr "Groepsnaam"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr "Authoritaire service"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr "Dynamsche DNS update"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr "Dynamische DNS update stijl"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr "Standaard lease tijd (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr "Voer de standaard lease tijd in seconden in"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr "Maximale leasetijd (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr "Voer de maximale lease tijd in seconden in."
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr "Netwerk configuratie"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
-msgstr "Router"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
-msgstr "Geeft de naam of het IP adres van de te gebruiken router op in deze sectie"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
-msgstr "Opstarten"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Bestandsnaam"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
-msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr "Geef de bestandsnaam die geladen zal worden via tftp nadat de client opgestart is"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr "Volgende server"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr "Geef de naam van de server waarvandaan opstart images geladen worden"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr "Domein Naam Service"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Domein"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr "Domeinnaam"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr "Lijst met te propageren DNS servers"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr "Selecteer de toe te voegen DNS server"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr "Klik hier om de geselecteerde server aan de lijst toe te voegen"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "Klik hier om de geselecteerde server uit de lijst te verwijderen"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "Domein Naam Service opties"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr "Ken hostnamen toe, zoals ze via omgekeerde DNS mapping gevonden worden"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr "Ken hostnamen toe zoals ze opgegeven zijn binnen host declaraties"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Reeks voor dynamische adres toekenning"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "Opties"
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "DNS update zone"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Waarschuwing"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr "Dit omvat 'alle' DHCP subsecties die zich binnen deze locatie bevinden. Verzeker uzelf hiervan, aangezien er geen manier is voor FusionDirectory om deze gegevens terug te halen."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "Het is aan te raden de huidige inhoud van uw LDAP database op te slaan alvorens u doorgaat. Indien u dat gedaan heeft drukt u op 'Verwijderen' om door te gaan of op 'Annuleren' om te annuleren."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Naam van de sleutel"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Encryptie methode"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Sectie"
 
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Poolnaam"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr "Selecteer het aan te maken sectie type"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
 msgid "Create new DHCP section"
 msgstr "Nieuwe DHCP sectie aanmaken"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr "Selecteer a.u.b. een van de volgende DHCP sectie types."
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Sectie"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Reeks"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Selecteer het aan te maken sectie type"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Aanmaken"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Verberg geavanceerde instellingen"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "DHCP regels"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "DHCP opties"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Toon geavanceerde instellingen"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Netwerkadres"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Hostnaam"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Vast adres"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr "Gebruik hostnaam of IP adres om een vast adres toe te kennen"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Naam voor gedeeld netwerk"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Server identificatie"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
-msgstr "Gepropageerde server identiteit voor dit gedeeld netwerk"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr "Selecteer of deze server authoritair is voor dit gedeeld netwerk"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
+msgstr "FDDI"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
+msgstr "Token ring"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "seconden"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
+msgstr "Hardware adres"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Minimale leasetijd"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Toegangsbeheer"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "Geef op of onbekende clients een dynamisch IP adres moeten ontvangen"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Sta onbekende clients toe"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
-msgstr "Geef op of bootp clients een dynamisch IP adres moeten ontvangen"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "bootp clients toestaan"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr "Geeft op of clients op mogen starten m.b.v. deze DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Opstarten toestaan"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr ""
diff --git a/dhcp/locale/pl/fusiondirectory.po b/dhcp/locale/pl/fusiondirectory.po
index b9cf207ba1..fd75c441f4 100644
--- a/dhcp/locale/pl/fusiondirectory.po
+++ b/dhcp/locale/pl/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Błąd"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automatyczne"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Adres sieciowy"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Maska sieciowa"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
-msgstr ""
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Uruchom usługę"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
-msgstr ""
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Zatrzymaj usługę"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
-msgstr ""
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Restartuj usługę"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "ImiÄ™"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Błąd"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Uruchom usługę"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Zatrzymaj usługę"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Restartuj usługę"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "Klasa"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Grupa"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "błąd LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Ogólne"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "Opcje"
 
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Sekcja"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Nazwa pliku"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Domena"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa drzewa LDAP. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Sekcja"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Utwórz"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Adres sieciowy"
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Typ sprzętu"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Identyfikator serwera"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Kontrola dostępu"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/pt/fusiondirectory.po b/dhcp/locale/pt/fusiondirectory.po
index 352a1c4f42..c7c9067a32 100644
--- a/dhcp/locale/pt/fusiondirectory.po
+++ b/dhcp/locale/pt/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Erro"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automático"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Nome"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Erro"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Geral"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Atenção"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "O melhor que se tem a fazer antes de realizar esta ação é salvar os dados da sua árvore LDAP em um arquivo. Então, se pronto, pressione 'Deletar' para continuar ou 'Cancelar' para abortar."
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Criar"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Controle de acesso"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/pt_BR/fusiondirectory.po b/dhcp/locale/pt_BR/fusiondirectory.po
index aacded8214..24182f2976 100644
--- a/dhcp/locale/pt_BR/fusiondirectory.po
+++ b/dhcp/locale/pt_BR/fusiondirectory.po
@@ -1,578 +1,349 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Erro"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automático"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Faixa de IP's"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr "Faixa de IP's não está dentro da rede configurada"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Endereço de rede"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
-msgstr "Faixa de IP's da rede"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr "Zona DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "Servidor DNS"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Serviço DHCP"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Iniciar serviço"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Parar serviço"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Reiniciar serviço"
+
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Expandir DHCP de subrede"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr "Inserir nova seção DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Nome"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Erro"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "A configuração de DHCP é desconhecida. Por favor, contacte seu administrador do sistema."
+msgstr ""
+"A configuração de DHCP é desconhecida. Por favor, contacte seu administrador"
+" do sistema."
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
-msgstr "Seções DHCP"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr "Serviço DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Iniciar serviço"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Parar serviço"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Reiniciar serviço"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr "Logando"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "Classe"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr "Erro na definição de '%s'!"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr "Chave"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "Opções"
 
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Genérico"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr "Nome do grupo"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr "Atualização dinâmica de DNS"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr ""
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Seção"
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr ""
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr "Escolha um tipo de seção a ser criado"
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
+msgstr "Criar nova seção DHCP"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Faixa de IP's"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Endereço de rede"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Domínio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr "Nome de domínio"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr "Lista de servidores DNS a ser propagada"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr "Clique aqui para adicionar os servidores selecionados para a lista"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "Clique aqui para remover os servidores selecionados da lista"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "Opções de DNS"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Faixa de IP's para designar endereços dinamicamente"
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "Atualizar zona DNS"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr "Isso inclui 'todas' as subseções DHCP que estão nesta seção. Por favor, clique duas vezes para confirmar. O FusionDirectory não poderá desfazer a ação."
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "A melhor coisa a se fazer neste caso é salvar o conteúdo atual da árvore LDAP. Se já fez isso, aperte 'Delete' para continuar ou 'Cancelar' para desistir."
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Método de encriptação"
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr "Criar nova seção DHCP"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr "Por favor, escolha um dos seguintes tipos de seção DHCP "
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Seção"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Escolha um tipo de seção a ser criado"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Criar"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Esconder configurações avançadas"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Opções de DHCP"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Mostrar configurações avançadas"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Endereços fixos"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Tipo de hardware"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Nome da rede compartilhada"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Indentificador do servidor"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr "Selecione caso este servidor seja autoritativo para esta rede compartilhada"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Servidor autoritativo"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "segundos"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Controle de acesso"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "Selecionar caso clientes desconhecidos devam receber IP dinâmico"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Permitir clientes desconhecidos"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/ru/fusiondirectory.po b/dhcp/locale/ru/fusiondirectory.po
index d5e12bbb47..e158fefc38 100644
--- a/dhcp/locale/ru/fusiondirectory.po
+++ b/dhcp/locale/ru/fusiondirectory.po
@@ -1,579 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-08 09:58+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Ошибка"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "автоматически"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Фамилия"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Диапозон"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Сетевой адрес"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Сетевая маска"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr " DNZ зона"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "DNS сервер"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
+msgstr "DHCP"
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr "FDDI"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
-msgstr "Token Ring"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Запустить службу"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Остановить службу"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Перезапустить службу"
+
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Фамилия"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Ошибка"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Запустить службу"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Остановить службу"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Перезапустить службу"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
-msgstr ""
+msgstr "Класс"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Хост"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Группа"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Ошибка LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Общее"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr ""
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "Параметры"
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
-msgstr ""
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Секция"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Диапозон"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Домен"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Секция"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Создать"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Сетевой адрес"
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
+msgstr "FDDI"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
+msgstr "Token Ring"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "секунды"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Алгоритм"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/ru@petr1708/fusiondirectory.po b/dhcp/locale/ru@petr1708/fusiondirectory.po
index ba45f8e9e3..0dea6db64a 100644
--- a/dhcp/locale/ru@petr1708/fusiondirectory.po
+++ b/dhcp/locale/ru@petr1708/fusiondirectory.po
@@ -1,578 +1,346 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:37+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
-msgid "Global options"
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-msgid ""
-"The DHCP configuration set is unkown. Please contact your system "
-"administrator."
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
+msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
-"The DN of dhcpService object which contain the configuration information"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
-msgid "The DHCP sections handled by this server"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
+"The DHCP configuration set is unkown. Please contact your system "
+"administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
+#: admin/dhcp/class_dhcpConfiguration.inc:492
+msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/sv/fusiondirectory.po b/dhcp/locale/sv/fusiondirectory.po
index 94992d7eae..672238d951 100644
--- a/dhcp/locale/sv/fusiondirectory.po
+++ b/dhcp/locale/sv/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:06+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Fel"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr "Kan inte ta bort automatiska statements!"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "automatisk"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Namn"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr "Range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr "'Range' är inte inom det konfigurerade nätverket."
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "Nätverksadress"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
-msgstr "Nätmask"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
-msgstr "Nätverks-range"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
-msgstr "DNS-zon"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
-msgstr "DNS-server"
-
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
-msgstr "Key DN"
-
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
-msgstr "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
-msgstr "FDDI"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
-msgstr "Token Ring"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
-msgstr "HÃ¥rdvaruadress"
+#: 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_dhcpService.inc:128
-msgid "Lease time"
-msgstr "Lease-tid"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "DHCP-tjänst"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
-msgstr "Max Lease-tid"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Starta tjänsten"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
-msgstr "Standard lease-tid"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Stoppa tjänsten"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Starta om tjänsten"
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
-msgstr "Maximal lease-tid"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Expandera DHCP-subnät"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr "Minimera DHCP-subnät"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr "Infoga ny DHCP-sektion"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Namn"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr "Globala inställningar"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Fel"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "DHCP-konfigurationen är okänd. Kontakta systemadministratören"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
-msgstr "DHCP-sektioner"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr "DHCP-tjänst"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr "Starta tjänsten"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr "Stoppa tjänsten"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr "Starta om tjänsten"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr "Loggning"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "Klass"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr "Subklass"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Grupp"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnät"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr "Delat nätverk"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr "DNS-uppdateringsnyckel"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr "DNS-uppdateringszoner"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "LDAP-fel"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr "Broadcast"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr "Fel i definitionen av '%s'!"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr "HMAC-MD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr "RSAMD5"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr "RSASHA1"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr "DH"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr "Nyckel-namn"
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr "Nyckel"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr "Max. lease-tid"
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr "Min. lease-tid"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Generisk"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr "Namn på grupp"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr "Auktoritär tjänst"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr "Dynamisk DNS-uppdatering"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr "Dynamisk DNS-uppdateringssätt"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr "Standard Lease-tid (sek)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr "Skriv in standard lease-tid i sekunder."
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr "Maximal lease-tid (s)"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr "Skriv in maximal lease-tid i sekunder."
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr "Nätverkskonfiguration"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
-msgstr "Router"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
-msgstr "Skriv in namn eller IP-adress för routern i den här sektionen"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
-msgstr "Bootup"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Filnamn"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
-msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr "Skriv in namnet på filen som ska laddas via tftp efter att klienten har startat"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr "Next server"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr "Skriv in namnet på servern att hämta bootimages från"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr "Domännamnsservice (DNS)"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "Domän"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr "Namn på domän"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr "Lista på DNS-servrar att propagera "
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr "DNS-servrar att lägga till"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr "Klicka här för att lägga till valda servrar till listan"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "Klicka här för att ta bort valda servrar från listan"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "DNS-tjänstalternativ"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr "Tilldela hostnamn som hittats via reverse mapping"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr "Tilldela hostnamn från host-deklarationer"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Range för dynamisk adresstilldelning"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "Alternativ"
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "DNS-uppdateringszon"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Varning"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr "Det här inkluderar 'alla' DHCP-subsektioner som inryms i denna sektion. Dubbelkolla att du verkligen vill göra detta eftersom det inte finns något sätt för FusionDirectory att få tillbaka din information."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "Det bästa att göra innan du utför denna åtgärd skulle vara att spara nuvarande innehåll i ditt LDAP-träd i en fil. Så - om du har gjort det - tryck 'Ta bort' för att fortsätta eller 'Avbryt' för att avbryta."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Namn på nyckel"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Krypteringsmetod"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "Sektion"
 
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Pool-namn"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr "Välj sektionstyp att skapa"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
 msgid "Create new DHCP section"
 msgstr "Skapa ny DHCP-sektion"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr "Välj någon av följande DHCP-sektionstyper"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Sektion"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
+msgstr "Range"
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Välj sektionstyp att skapa"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Skapa"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Göm avancerade inställningar"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "DHCP-statements"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "DHCP-alternativ"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Visa avancerade inställningar"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Nätverksadress"
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Namn på host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Fast adress"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr "Använd hostnamn eller IP-adress för att tilldela fasta adresser"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "HÃ¥rdvarutyp"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Namn på delat nätverk"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Server-identifierare"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
-msgstr "Propagerad serveridentifierare för det här delade nätverket"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr "Välj om den här servern är auktoriserad för det här delade nätverket"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
+msgstr "Ethernet"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Auktoritär server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
+msgstr "FDDI"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Tilldelningar"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
+msgstr "Token Ring"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
-msgstr "sekunder"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
+msgstr "HÃ¥rdvaruadress"
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Minimum lease-tid"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Ã…tkomstkontroll"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "Välj om okända klienter ska få dynamiska IP-adresser"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Tillåt okända klienter"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
-msgstr "Välj om bootp-klienter ska få dynamiska IP-adresser"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Tillåt bootp-klienter"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr "Välj om klienter är tillåtna att boota genom den här DHCP-servern"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Tillåt boot"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr ""
diff --git a/dhcp/locale/ug/fusiondirectory.po b/dhcp/locale/ug/fusiondirectory.po
index d8ef18771a..e060f693f3 100644
--- a/dhcp/locale/ug/fusiondirectory.po
+++ b/dhcp/locale/ug/fusiondirectory.po
@@ -1,578 +1,346 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:37+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
-msgid "Global options"
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-msgid ""
-"The DHCP configuration set is unkown. Please contact your system "
-"administrator."
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
+msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
-"The DN of dhcpService object which contain the configuration information"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
-msgid "The DHCP sections handled by this server"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
+"The DHCP configuration set is unkown. Please contact your system "
+"administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
+#: admin/dhcp/class_dhcpConfiguration.inc:492
+msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/vi_VN/fusiondirectory.po b/dhcp/locale/vi_VN/fusiondirectory.po
index 492f59a2fe..ed8ade50f6 100644
--- a/dhcp/locale/vi_VN/fusiondirectory.po
+++ b/dhcp/locale/vi_VN/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "Lá»—i"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "tự động"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "Tên"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "Tên"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "Lá»—i"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "Nhóm "
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "Lá»—i LDAP"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "Thông tin chung"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "Cảnh báo"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "Tốt nhất là trước khi thực hiện thao tác này bạn nên  lưu lại nội dung hiện tại của cây thư mục LDAP trong một file. Nếu bạn đã làm thế, hãy kích 'Delete' để tiếp tục hoặc kích 'Cancel' để hủy bỏ."
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Tạo "
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Kiểm soát truy cập"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
diff --git a/dhcp/locale/zh/fusiondirectory.po b/dhcp/locale/zh/fusiondirectory.po
index 71d23a0207..44fcd36fe3 100644
--- a/dhcp/locale/zh/fusiondirectory.po
+++ b/dhcp/locale/zh/fusiondirectory.po
@@ -1,578 +1,347 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:05+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
+"POT-Creation-Date: 2016-09-27 21:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-msgid "Error"
-msgstr "错误"
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-msgid "Cannot delete automatic statements!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
-#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
-msgid "automatic"
-msgstr "自动"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:104
-#: admin/systems/services/dhcp/class_dhcpPool.inc:112
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:150
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:86
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:89
-#: admin/systems/services/dhcp/class_dhcpSubClass.inc:97
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:165
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:87
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:90
-#: admin/systems/services/dhcp/class_dhcpGroup.inc:98
-#: admin/systems/services/dhcp/class_dhcpHost.inc:127
-#: admin/systems/services/dhcp/class_dhcpHost.inc:138
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
-#: admin/systems/services/dhcp/class_dhcpClass.inc:87
-#: admin/systems/services/dhcp/class_dhcpClass.inc:90
-#: admin/systems/services/dhcp/class_dhcpClass.inc:98
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:152
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:170
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:5
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:5
-msgid "Name"
-msgstr "名称"
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:119
-#: admin/systems/services/dhcp/class_dhcpPool.inc:123
-#: admin/systems/services/dhcp/class_dhcpPool.inc:127
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:160
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:161
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:11
-msgid "Range"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpPool.inc:141
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
-msgid "'Range' is not inside the configured network."
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:159
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:5
-msgid "Network address"
-msgstr "网络地址"
-
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:142
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:158
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:11
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:8
-msgid "Netmask"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
-msgid "Network range"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:145
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
-msgid "DNS zone"
+#: admin/systems/class_dhcpSystem.inc:218
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:149
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
-msgid "DNS server"
+#: admin/systems/class_dhcpSystem.inc:219
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:153
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
-msgid "Key DN"
+#: admin/systems/class_dhcpSystem.inc:233
+msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:64
-msgid "Ethernet"
+#: admin/systems/class_dhcpSystem.inc:237
+msgid "DHCP hosts declared for this system"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:65
-msgid "FDDI"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpHost.inc:66
-msgid "Token Ring"
+#: 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_dhcpHost.inc:147
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
-msgid "Hardware address"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:128
-msgid "Lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:131
-msgid "Max lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:26
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:29
-msgid "Default lease time"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
-msgid "Maximum lease time"
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:38
+#: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:39
+#: admin/dhcp/class_dhcpConfiguration.inc:37
 msgid "Expand"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:48
+#: admin/dhcp/class_dhcpConfiguration.inc:46
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:49
+#: admin/dhcp/class_dhcpConfiguration.inc:47
 msgid "Fold"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:107
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:108
+#: admin/dhcp/class_dhcpConfiguration.inc:105
+#: admin/dhcp/class_dhcpConfiguration.inc:106
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:316
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:356
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:460
+#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name"
+msgstr "名称"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:354
+#: admin/dhcp/class_dhcpConfiguration.inc:395
+#: admin/dhcp/class_dhcpConfiguration.inc:504
 msgid "Global options"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:371
+#: admin/dhcp/class_dhcpConfiguration.inc:410
+msgid "Error"
+msgstr "错误"
+
+#: admin/dhcp/class_dhcpConfiguration.inc:410
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:2
-msgid "DHCP sections"
+#: admin/dhcp/class_dhcpConfiguration.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:468
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:429
-msgid ""
-"The DN of dhcpService object which contain the configuration information"
+#: admin/dhcp/class_dhcpConfiguration.inc:482
+msgid "DHCP Objects"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:433
+#: admin/dhcp/class_dhcpConfiguration.inc:492
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:444
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:445
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:449
-msgid "Start service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:450
-msgid "Stop service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:451
-msgid "Restart service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:459
+#: admin/dhcp/class_dhcpConfiguration.inc:503
 msgid "Logging"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:461
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "Class"
 msgstr "ç±»"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:462
+#: admin/dhcp/class_dhcpConfiguration.inc:506
 msgid "Subclass"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:463
+#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:464
+#: admin/dhcp/class_dhcpConfiguration.inc:508
 msgid "Group"
 msgstr "组"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:465
+#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:466
+#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:467
+#: admin/dhcp/class_dhcpConfiguration.inc:511
 msgid "Failover peer"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:468
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:469
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
+#: admin/dhcp/class_dhcpConfiguration.inc:513
 msgid "DNS update key"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:470
+#: admin/dhcp/class_dhcpConfiguration.inc:514
 msgid "DNS update zones"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:519
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:585
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:590
-msgid "LDAP error"
-msgstr "LDAP 错误"
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
-msgid "Broadcast"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:202
-#, php-format
-msgid "Error in definition of '%s'!"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "HMAC-MD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSAMD5"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "RSASHA1"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DSA"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
-msgid "DH"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:109
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:125
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
-msgid "Key name"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:113
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
-msgid "Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:35
-msgid "Max. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:44
-msgid "Min. lease time"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:2
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:2
-msgid "Generic"
-msgstr "通用配置"
-
-#: admin/systems/services/dhcp/dhcp_group.tpl.c:8
-msgid "Name of group"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:5
-msgid "Authoritative service"
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+msgid "Name of this DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:8
-msgid "Dynamic DNS update"
-msgstr ""
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr "选项"
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:14
-msgid "Default lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+msgid "Comments about this DHCP object"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:2
-msgid "Network configuration"
-msgstr ""
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr "节"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:5
-msgid "Router"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:8
-msgid "Enter name or IP address of router to be used in this section"
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+msgid "Range"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "文件名"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:23
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
 msgid ""
-"Enter name of file that will be loaded via tftp after client has started"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:26
-msgid "Next server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:29
-msgid "Enter name of server to retrieve bootimages from"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:32
-msgid "Domain Name Service"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:35
-msgid "Domain"
-msgstr "域"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:38
-msgid "Name of domain"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:44
-msgid "List of DNS servers to be propagated"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:47
-msgid "DNS server do be added"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:50
-msgid "Click here add the selected server to the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
-msgid "Warning"
-msgstr "警告"
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:5
-msgid ""
-"This includes 'all' DHCP subsections that are located within this section. "
-"Please double check if your really want to do this since there is no way for"
-" FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:8
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr "最好在执行这个操作之前,保存当前 LDAP 树中的内容到一个文件。所以,如果您已经这么做了,按“删除”继续或者按“取消”退出。"
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-msgid "Create new DHCP section"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:5
-msgid "Please choose one of the following DHCP section types."
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "节"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "创建"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "网络地址"
 
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:32
+#: admin/dhcp/sections/class_dhcpHost.inc:41
+msgid "The client hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "服务器标识"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:14
-msgid "Propagated server identifier for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:35
+msgid "The hardware address type"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Ethernet"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "FDDI"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
+#: admin/dhcp/sections/class_dhcpHost.inc:38
+msgid "Token Ring"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:32
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:50
-msgid "seconds"
+#: admin/dhcp/sections/class_dhcpHost.inc:48
+msgid "Hardware address"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
-- 
GitLab


From 1b32a682ab02826da66cfc0ab76c77f270571409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 24 Oct 2016 11:46:36 +0200
Subject: [PATCH 11/54] Fixes #5198 Removed 1.1 error handling from 1.0.17

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc | 6 ++++--
 dhcp/admin/systems/class_dhcpSystem.inc     | 8 +++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index 37cc726b7e..2a707bd35f 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -524,7 +524,7 @@ class dhcpConfiguration extends simplePlugin
     return TRUE;
   }
 
-  protected function ldap_save()
+  protected function ldap_save($cleanup = TRUE)
   {
     global $config;
     /* Save dhcp settings */
@@ -605,7 +605,9 @@ class dhcpConfiguration extends simplePlugin
       }
     }
 
+    msg_dialog::displayChecks($errors);
+
     //~ parent::ldap_save();
-    return $errors;
+    return !empty($errors);
   }
 }
diff --git a/dhcp/admin/systems/class_dhcpSystem.inc b/dhcp/admin/systems/class_dhcpSystem.inc
index e5752d22eb..a87aa48f54 100644
--- a/dhcp/admin/systems/class_dhcpSystem.inc
+++ b/dhcp/admin/systems/class_dhcpSystem.inc
@@ -183,8 +183,7 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
       }
       $dhcpTabs = objects::open($configDn, 'dhcpConfiguration');
       $dhcpTabs->getBaseObject()->attributesAccess['dhcpSections']->delHost($value[3]);
-      $errors = $dhcpTabs->save();
-      msg_dialog::displayChecks($errors);
+      $dhcpTabs->save();
     }
     foreach ($values as $value) {
       $configDn = $value[0];
@@ -195,8 +194,7 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
       }
       $dhcpTabs = objects::open($configDn, 'dhcpConfiguration');
       $dhcpTabs->getBaseObject()->attributesAccess['dhcpSections']->addHost($value[0], $cn, $value[1], $value[2]);
-      $errors = $dhcpTabs->save();
-      msg_dialog::displayChecks($errors);
+      $dhcpTabs->save();
     }
     /* TODO
      * ? handle modification somehow (if we want to keep statements when changing IP, not sure about this)
@@ -279,7 +277,7 @@ class dhcpSystem extends simplePlugin
     return $nodes;
   }
 
-  function ldap_save()
+  function ldap_save($cleanup = TRUE)
   {
     global $config;
 
-- 
GitLab


From 1efea7388147dfc8532d02404c19f37237ad0505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 24 Oct 2016 14:14:15 +0200
Subject: [PATCH 12/54] Fixes #5193 Added ppolicy tab for DSA objects

---
 ppolicy/personal/ppolicy/class_ppolicyAccount.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ppolicy/personal/ppolicy/class_ppolicyAccount.inc b/ppolicy/personal/ppolicy/class_ppolicyAccount.inc
index 738a5ff58a..dd5e3fe9ae 100644
--- a/ppolicy/personal/ppolicy/class_ppolicyAccount.inc
+++ b/ppolicy/personal/ppolicy/class_ppolicyAccount.inc
@@ -29,7 +29,7 @@ class ppolicyAccount extends simplePlugin
       'plShortName'     => _('Password policy'),
       'plDescription'   => _('Edit user\'s password policy'),
       'plSelfModify'    => TRUE,
-      'plObjectType'    => array('user'),
+      'plObjectType'    => array('user', 'simpleSecurityObject'),
       'plIcon'          => 'geticon.php?context=applications&icon=ppolicy&size=48',
       'plSmallIcon'     => 'geticon.php?context=applications&icon=ppolicy&size=16',
 
-- 
GitLab


From f38a38d65055882c3fd425b7328a91d019f0ff11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 24 Oct 2016 14:52:16 +0200
Subject: [PATCH 13/54] Hardware address should be mandatory for DHCP hosts

---
 dhcp/admin/dhcp/sections/class_dhcpHost.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhcp/admin/dhcp/sections/class_dhcpHost.inc b/dhcp/admin/dhcp/sections/class_dhcpHost.inc
index b6ea0984a9..60783abbc6 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpHost.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpHost.inc
@@ -39,7 +39,7 @@ class dhcpHost extends dhcpPlugin
             ),
             new StringAttribute (
               '', _('The client hardware address'),
-              'dhcpHWAddress_address', FALSE
+              'dhcpHWAddress_address', TRUE
             ),
           ),
           '/^([^ ]+) ([^ ]+)$/',
-- 
GitLab


From 01d10e50affde40d3f316b5cad163791ed699edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 24 Oct 2016 15:11:21 +0200
Subject: [PATCH 14/54] DHCP tsigkey have no options or statements, avoid
 errors

---
 dhcp/admin/dhcp/class_dhcpPlugin.inc | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/dhcp/admin/dhcp/class_dhcpPlugin.inc b/dhcp/admin/dhcp/class_dhcpPlugin.inc
index 3afcd2b888..f091ee9806 100644
--- a/dhcp/admin/dhcp/class_dhcpPlugin.inc
+++ b/dhcp/admin/dhcp/class_dhcpPlugin.inc
@@ -122,9 +122,11 @@ class dhcpPlugin extends simplePlugin
 
   function getOption($option)
   {
-    foreach ($this->dhcpOption as $line) {
-      if (preg_match('/^'.preg_quote($option, '/').' (.*)$/', $line, $m)) {
-        return $m[1];
+    if (isset($this->dhcpOption)) {
+      foreach ($this->dhcpOption as $line) {
+        if (preg_match('/^'.preg_quote($option, '/').' (.*)$/', $line, $m)) {
+          return $m[1];
+        }
       }
     }
     return NULL;
@@ -132,9 +134,11 @@ class dhcpPlugin extends simplePlugin
 
   function getStatement($statement)
   {
-    foreach ($this->dhcpStatements as $line) {
-      if (preg_match('/^'.preg_quote($statement, '/').' (.*)$/', $line, $m)) {
-        return $m[1];
+    if (isset($this->dhcpStatements)) {
+      foreach ($this->dhcpStatements as $line) {
+        if (preg_match('/^'.preg_quote($statement, '/').' (.*)$/', $line, $m)) {
+          return $m[1];
+        }
       }
     }
     return NULL;
-- 
GitLab


From 2821fd4f42cf0ae94d60c0522174dac9f675cce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 24 Oct 2016 15:28:03 +0200
Subject: [PATCH 15/54] =?UTF-8?q?Duplicating=20systems=20menu=20section=20?=
 =?UTF-8?q?in=20DHCP=C2=A0as=20well?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dhcp/admin/dhcp/class_dhcpManagement.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhcp/admin/dhcp/class_dhcpManagement.inc b/dhcp/admin/dhcp/class_dhcpManagement.inc
index 80c4f447be..f7c6862a8e 100644
--- a/dhcp/admin/dhcp/class_dhcpManagement.inc
+++ b/dhcp/admin/dhcp/class_dhcpManagement.inc
@@ -34,7 +34,7 @@ class dhcpManagement extends simpleManagement
       'plShortName'   => _('DHCP'),
       'plDescription' => _('DHCP Management'),
       'plIcon'        => 'geticon.php?context=applications&icon=dhcp&size=48',
-      'plSection'     => 'systems',
+      'plSection'     => array('systems' => array('name' => _('Systems'), 'priority' => 10)),
       'plPriority'    => 2,
       'plManages'     => array('dhcpConfiguration'),
 
-- 
GitLab


From 5192ccdccaa11cf87c231d29c1cbbe2a7018fa89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 24 Oct 2016 16:46:50 +0200
Subject: [PATCH 16/54] Fixes #5198 setting default max-lease to 7200

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc    | 2 +-
 dhcp/admin/dhcp/sections/class_dhcpService.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index 2a707bd35f..f48c77f560 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -385,7 +385,7 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
       //~ 'dhcpPrimaryDN'   => array($this->plugin->dn),
       'dhcpStatements'  => array(
         'default-lease-time 600',
-        'max-lease-time 1200',
+        'max-lease-time 7200',
         'authoritative',
         'ddns-update-style none'
       ),
diff --git a/dhcp/admin/dhcp/sections/class_dhcpService.inc b/dhcp/admin/dhcp/sections/class_dhcpService.inc
index 9cfc858692..a25a3d1df1 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpService.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpService.inc
@@ -28,7 +28,7 @@ class dhcpService extends dhcpPlugin
     $attributesInfo['main']['attrs'][2]->setDefaultValue(
       array(
         'default-lease-time 600',
-        'max-lease-time 1700',
+        'max-lease-time 7200',
         'authoritative',
         'ddns-update-style none'
       )
-- 
GitLab


From d23384dbc81a9cde518e1c584d66e0ee8e349fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 24 Oct 2016 16:47:14 +0200
Subject: [PATCH 17/54] Fixes #5198 Removing DHCP from systems

---
 .../admin/systems/class_networkSettings.inc   | 329 +-----------------
 systems/admin/systems/network.tpl             |  51 ---
 2 files changed, 2 insertions(+), 378 deletions(-)

diff --git a/systems/admin/systems/class_networkSettings.inc b/systems/admin/systems/class_networkSettings.inc
index 6e683f0281..1a776a8d91 100644
--- a/systems/admin/systems/class_networkSettings.inc
+++ b/systems/admin/systems/class_networkSettings.inc
@@ -42,18 +42,6 @@ class networkSettings extends plugin
   var $MACisMust      = TRUE;
   var $dialog         = FALSE;
 
-  /* DCHP Attributes
-   */
-  var $dhcpAttributes           = array("dhcpParentNode");
-  var $dhcpEnabled              = FALSE;
-  var $dhcp_is_Account          = FALSE;
-  var $dhcpParentNodes          = array();
-  var $dhcpParentNode           = "";
-  var $dhcpHostEntry            = array();
-  var $initial_dhcpParentNode   = "";
-  var $initial_dhcpHostEntry    = array();
-  var $initial_dhcp_is_Account  = FALSE;
-
   var $used_ip_mac              = array();
 
   var $namingAttr               = "cn";
@@ -86,25 +74,6 @@ class networkSettings extends plugin
       }
     }
 
-    /************
-     * DHCP
-     ************/
-
-    /* Hide all dhcp specific code, if dhcp plugin is not present in config */
-    $this->dhcpEnabled = class_available('dhcpHost');
-
-    if ($this->dhcpEnabled) {
-      $this->dhcpParentNodes = $this->get_dhcp_parent_nodes();
-      $this->dhcpParentNode  = $this->get_dhcp_parent_node();
-      if ($this->dhcpParentNode) {
-        $this->dhcp_is_Account          = TRUE;
-        $this->initial_dhcp_is_Account  = TRUE;
-        $this->dhcpHostEntry            = $this->get_dhcp_host_entry();
-      }
-      $this->initial_dhcpHostEntry  = $this->dhcpHostEntry;
-      $this->initial_dhcpParentNode = $this->dhcpParentNode;
-    }
-
     /* Create a list of used mac and ip addresses.
 
        ! We use this optically huge amount of code to fetch all
@@ -142,9 +111,6 @@ class networkSettings extends plugin
 
   function resetCopyInfos()
   {
-    $this->initial_dhcp_is_Account  = FALSE;
-    $this->initial_dhcpHostEntry    = array();
-    $this->initial_dhcpParentNode   = "";
     $this->orig_ipHostNumber        = "";
     $this->orig_macAddress          = "";
     $this->OrigCn                   = "";
@@ -206,52 +172,11 @@ class networkSettings extends plugin
 
     $smarty->assign("additionalHostNumbers", $this->additionalHostNumbers);
 
-    /**********
-     * DHCP Handling
-     **********/
-
-    if (isset($_POST['dhcpEditOptions']) && $this->acl_is_readable("dhcpSetup")) {
-      if (count($this->dhcpHostEntry) == 0) {
-        $this->dialog = new dhcpHost($this->parent, $this->dhcpParentNode, TRUE);
-      } else {
-        $this->dialog = new dhcpHost($this->parent, $this->dhcpHostEntry, TRUE);
-      }
-      $this->dialog->cn   = $this->getCn();
-      $this->dialog->read_only     = !$this->acl_is_writeable("dhcpSetup");
-      $this->dialog->dhcpHWAddress = "ethernet ".$this->macAddress;
-      if (!empty($this->ipHostNumber)) {
-        $this->dialog->statements->set('fixed-address', $this->ipHostNumber);
-      }
-    }
-
-    if (isset($_POST['cancel_dhcp'])) {
-      $this->dialog = FALSE;
-    }
-
-    if (isset($_POST['save_dhcp']) && $this->acl_is_writeable("dhcpSetup") && is_object($this->dialog)) {
-      $this->dialog->save_object();
-      $msgs = $this->dialog->check(array());
-      if (count($msgs)) {
-        foreach ($msgs as $msg) {
-          msg_dialog::display(_("Error"), $msg, ERROR_DIALOG);
-        }
-      } else {
-        $this->dhcpHostEntry = $this->dialog->save();
-        $this->dialog = FALSE;
-      }
-    }
-
     if (is_object($this->dialog)) {
       $this->dialog->save_object();
       return $this->dialog->execute();
     }
 
-    $smarty->assign("dhcpEnabled",        $this->dhcpEnabled && $this->acl_is_readable("dhcpSetup"));
-    $smarty->assign("dhcp_is_Account",    $this->dhcp_is_Account);
-    $smarty->assign("dhcpParentNode",     $this->dhcpParentNode);
-    $smarty->assign("dhcpParentNodes",    $this->dhcpParentNodes);
-    $smarty->assign("dhcpParentNodeCnt",  count($this->dhcpParentNodes));
-
     /* Is IP address must ? */
     $smarty->assign("IPisMust", $this->IPisMust);
 
@@ -268,20 +193,6 @@ class networkSettings extends plugin
 
   function remove_from_parent()
   {
-    global $config;
-    $ldap = $config->get_ldap_link();
-
-    /************
-     * DHCP Handling
-     ************/
-
-    /* DHCP removed */
-    if ($this->dhcp_is_Account) {
-      $ldap->rmdir_recursive($this->dhcpHostEntry['dn']);
-      if (!$ldap->success()) {
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dhcpHostEntry['dn'], LDAP_DEL, get_class()), LDAP_ERROR);
-      }
-    }
   }
 
 
@@ -306,23 +217,6 @@ class networkSettings extends plugin
         }
       }
 
-      /******
-        DHCP posts
-       ******/
-
-      if ($this->acl_is_writeable("dhcpSetup") && $this->dhcpEnabled && isset($_POST['network_tpl_posted'])) {
-        foreach ($this->dhcpAttributes as $attr) {
-          if (isset($_POST[$attr])) {
-            $this->$attr = $_POST[$attr];
-          }
-        }
-        if (isset($_POST['dhcp_is_Account'])) {
-          $this->dhcp_is_Account = TRUE;
-        } else {
-          $this->dhcp_is_Account = FALSE;
-        }
-      }
-
       /* Get all attributes (IP/MAC)*/
       foreach ($this->attributes as $attr) {
         if (isset($_POST[$attr]) && $this->acl_is_writeable($attr)) {
@@ -355,13 +249,6 @@ class networkSettings extends plugin
         in_array("ip:".$this->ipHostNumber, $this->used_ip_mac)) {
       $message[] = msgPool::duplicated(_("IP address"));
     }
-    if ($this->dhcp_is_Account) {
-      if (!empty($this->macAddress) &&
-          $this->macAddress != $this->orig_macAddress &&
-          in_array("mac:".$this->macAddress, $this->used_ip_mac)) {
-        $message[] = msgPool::duplicated(_("MAC address"));
-      }
-    }
 
     /* Check if ip must be given */
     if ($this->IPisMust) {
@@ -373,7 +260,7 @@ class networkSettings extends plugin
     }
 
     /* Check if mac is empty */
-    if ($this->MACisMust || $this->dhcp_is_Account) {
+    if ($this->MACisMust) {
       if ($this->macAddress == "" ) {
         $message[] = msgPool::required(_("MAC address"));
       } elseif (!tests::is_mac($this->macAddress)) {
@@ -427,137 +314,13 @@ class networkSettings extends plugin
       msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()), LDAP_ERROR);
     }
 
-    /* DHCP HANDLING */
-
-    /* New entry */
-    if ($this->dhcpEnabled && $this->acl_is_writeable('dhcpSetup')) {
-      if (count($this->dhcpHostEntry) == 0) {
-        $this->dialog = new dhcpHost($this->parent, $this->dhcpParentNode, TRUE);
-        $this->dialog->cn = $cn;
-        $this->dialog->dhcpHWAddress = 'ethernet '.$this->macAddress;
-        if (!empty($this->ipHostNumber)) {
-          $this->dialog->statements->set('fixed-address', $this->ipHostNumber);
-        }
-        $this->dialog->execute();
-        $this->dialog->save_object();
-        $this->dhcpHostEntry = $this->dialog->save();
-        if (count($this->dhcpHostEntry['dhcpOption']) == 0) {
-          $this->dhcpHostEntry['dhcpOption'] = array('host-name '.$cn);
-        }
-      } else {
-        // Updated Host-Name entry
-        foreach ($this->dhcpHostEntry['dhcpOption'] as $key => $entry) {
-          if (preg_match('/^host-name/', $entry)) {
-            $this->dhcpHostEntry['dhcpOption'][$key] = 'host-name '.$cn;
-            break;
-          }
-        }
-      }
-
-      /* Write mac address to dhcp settings */
-      if ($this->dhcp_is_Account) {
-        if (!isset($this->dhcpHostEntry['dhcpHWAddress'][0]) ||
-            !preg_match('/ethernet '.$this->macAddress.'/', $this->dhcpHostEntry['dhcpHWAddress'][0])) {
-          $this->dhcpHostEntry['dhcpHWAddress'] = array('ethernet '.$this->macAddress);
-          $this->dhcpHostEntry['MODIFIED'] = TRUE;
-        }
-      }
-
-      /* Updated IP host number */
-      if ($this->dhcp_is_Account && $this->dhcpHostEntry['dhcpStatements']) {
-        foreach ($this->dhcpHostEntry['dhcpStatements'] as $id => $value) {
-          if (preg_match('/^fixed-address/', $value)) {
-            $this->dhcpHostEntry['dhcpStatements'][$id] = 'fixed-address '.$this->ipHostNumber;
-            $this->dhcpHostEntry['MODIFIED']            = TRUE;
-          }
-        }
-      }
-
-      /* Unset dhcpStatements if this attribute is empty  */
-      if (isset($this->dhcpHostEntry['dhcpStatements']) &&
-          ($this->dhcpHostEntry['dhcpStatements'] == "" || count($this->dhcpHostEntry['dhcpStatements']) == 0) ) {
-        unset($this->dhcpHostEntry['dhcpStatements']);
-      }
-
-      /* DHCP removed */
-      if ($this->initial_dhcp_is_Account && !$this->dhcp_is_Account) {
-        $ldap->rmdir_recursive($this->dhcpHostEntry['dn']);
-        if (!$ldap->success()) {
-          msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $this->dhcpHostEntry['dn'], LDAP_DEL, get_class()), LDAP_ERROR);
-        }
-
-        $tmp = new serviceDHCP($this->dhcpParentNode);
-        $tmp->handle_post_events('remove');
-      }
-
-      /* DHCP Added */
-      if (!$this->initial_dhcp_is_Account && $this->dhcp_is_Account) {
-        $attrs = $this->dhcpHostEntry;
-        unset($attrs['MODIFIED']);
-        unset($attrs['dn']);
-        $ldap->cd('cn='.$cn.','.$this->dhcpParentNode);
-        $res = $ldap->add($attrs);
-
-        $tmp = new serviceDHCP($this->dhcpParentNode);
-        $tmp->handle_post_events('add');
-
-        if (!$ldap->success()) {
-          msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), 'cn='.$cn.','.$this->dhcpParentNode, LDAP_ADD, get_class()), LDAP_ERROR);
-        }
-      }
-
-      /* DHCP still activated */
-      if ($this->initial_dhcp_is_Account && $this->dhcp_is_Account) {
-
-        /* DHCP node changed */
-        if (($this->initial_dhcpParentNode != $this->dhcpParentNode) ||
-           ($cn != $this->OrigCn)) {
-          $attrs        = $this->dhcpHostEntry;
-          $attrs['cn']  = $cn;
-          unset($attrs['dn']);
-          unset($attrs['MODIFIED']);
-          $ldap->cd('cn='.$cn.','.$this->dhcpParentNode);
-          $res = $ldap->add($attrs);
-          if (!$ldap->success()) {
-            msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), 'cn='.$cn.','.$this->dhcpParentNode, LDAP_ADD, get_class()), LDAP_ERROR);
-          }
-
-          $tmp = new serviceDHCP($this->dhcpParentNode);
-          $tmp->handle_post_events('modify');
-
-          if ($res) {
-            $ldap->rmdir_recursive($this->dhcpHostEntry['dn']);
-            if (!$ldap->success()) {
-              msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $this->dhcpHostEntry['dn'], LDAP_DEL, get_class()), LDAP_ERROR);
-            }
-          }
-        }
-
-        /* SAME node but modified */
-        if (isset($this->dhcpHostEntry['MODIFIED']) && ($this->dhcpHostEntry['MODIFIED'] == 1) &&
-            $this->initial_dhcpParentNode == $this->dhcpParentNode) {
-          $attrs = $this->dhcpHostEntry;
-          unset($attrs['dn']);
-          unset($attrs['MODIFIED']);
-          $ldap->cd($this->dhcpHostEntry['dn']);
-          $ldap->modify($attrs);
-
-          $tmp = new serviceDHCP($this->dhcpParentNode);
-          $tmp->handle_post_events('modify');
-
-          if (!$ldap->success()) {
-            msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $this->dhcpHostEntry['dn'], LDAP_MOD, get_class()), LDAP_ERROR);
-          }
-        }
-      }
-    }
     $this->dialog = FALSE;
   }
 
   /* Return plugin informations for acl handling  */
   static function plInfo()
   {
-    $tmp = array(
+    return array(
       'plShortName'   => _('Network'),
       'plDescription' => _('Network settings'),
       'plSelfModify'  => FALSE,
@@ -569,94 +332,6 @@ class networkSettings extends plugin
         'macAddress'    => _('MAC address')
       )
     );
-
-    /* Hide all dhcp configuration if not available */
-    if (class_available('serviceDHCP')) {
-      $tmp['plProvidedAcls']['dhcpSetup'] = _('DHCP configuration');
-    }
-    return $tmp;
-  }
-
-
-  function get_dhcp_host_entry()
-  {
-    global $config;
-    $attrs = array();
-    $dn = $this->get_dhcp_host_entry_dn();
-    if ($dn) {
-      $ldap = $config->get_ldap_link();
-      $ldap->cd($config->current['BASE']);
-      $ldap->cat($dn, array('*'));
-      if ($ldap->count()) {
-        $attrs = $ldap->fetch();
-        foreach ($attrs as $key => $value) {
-          if (is_numeric($key) || ($key == 'count')) {
-            unset($attrs[$key]);
-          }
-          if (is_array($value) && isset($value['count'])) {
-            unset($attrs[$key]['count']);
-          }
-        }
-      }
-    }
-    return $attrs;
-  }
-
-
-  function get_dhcp_host_entry_dn()
-  {
-    global $config;
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->search ('(&(objectClass=dhcpHost)(cn='.$this->getCn().'))', array('uid','cn','dn'));
-
-    if ($ldap->count()) {
-      $attr = $ldap->fetch();
-      return $attr['dn'];
-    } else {
-      return '';
-    }
-  }
-
-
-  function get_dhcp_parent_node()
-  {
-    return preg_replace('/^cn='.preg_quote($this->getCn(), '/').',/', '', $this->get_dhcp_host_entry_dn());
-  }
-
-  function get_dhcp_parent_nodes()
-  {
-    global $config;
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->search('(objectClass=dhcpService)', array('dhcpPrimaryDN'));
-
-    $dhcp_dns = array();
-    while ($attr = $ldap->fetch()) {
-      $dhcp_dns[$attr['dn']] = $attr['dhcpPrimaryDN'][0];
-    }
-
-    foreach ($dhcp_dns as $key => $pri_dns) {
-      $ldap->cat($pri_dns, array('cn'));
-      $tmp = $ldap->fetch();
-      if (isset($tmp['cn'][0])) {
-        $dhcp_dns[$key] = $tmp['cn'][0];
-      } else {
-        unset($dhcp_dns[$key]);
-      }
-    }
-
-    $tmp = $tmp2 = array();
-    foreach ($dhcp_dns as $dn => $cn) {
-      $ldap->cd($dn);
-      $ldap->search('(|(objectClass=dhcpService)(objectClass=dhcpGroup)'.
-                    '(objectClass=dhcpSubnet)(objectClass=dhcpSharedNetwork))', array('cn'));
-      while ($attr = $ldap->fetch()) {
-        $tmp[$attr['dn']] = $attr['cn'][0];
-      }
-      $tmp2 = array_merge($tmp2, $this->create_tree($tmp, preg_replace('/^[^,]+,/i', '', $dn), '('.$cn.')&nbsp;'));
-    }
-    return $tmp2;
   }
 
   function generateRandomIP($net = "")
diff --git a/systems/admin/systems/network.tpl b/systems/admin/systems/network.tpl
index fae9bba15c..375ac4c6ca 100644
--- a/systems/admin/systems/network.tpl
+++ b/systems/admin/systems/network.tpl
@@ -38,57 +38,6 @@
 {/render}
           </td>
         </tr>
-        {if $dhcpEnabled}
-        <tr>
-          <td colspan=2 style='padding-top:12px;'>
-            <table>
-              {if $dhcpParentNodeCnt}
-              <tr>
-                <td>
-{render acl=$dhcpSetupACL}
-                  <input onClick='document.mainform.submit();'
-                    {if $dhcp_is_Account} checked {/if} type='checkbox' name='dhcp_is_Account' id='dhcp_is_Account' class='center'>
-{/render}
-                </td>
-                <td colspan="2">
-                  <label for="dhcp_is_Account">{t}Enable DHCP for this device{/t}</label>
-{render acl=$dhcpSetupACL}
-                  <input type='image' src='geticon.php?context=actions&icon=view-refresh&size=16' class='center'>
-{/render}
-                </td>
-              </tr>
-              {else}
-              <tr>
-                <td>
-                  <input type='checkbox' name='dummy' id='dhcp_is_Account' class='center' disabled>
-                  <label for="dhcp_is_Account">{t}Enable DHCP for this device{/t} ({t}not configured{/t})</label>
-                </td>
-              </tr>
-              {/if}
-              {if $dhcp_is_Account}
-              <tr>
-                <td>&nbsp;</td>
-                <td>{t}Parent node{/t}</td>
-                <td>
-{render acl=$dhcpSetupACL}
-                  <select name='dhcpParentNode'>
-                    {html_options options=$dhcpParentNodes selected=$dhcpParentNode}
-                  </select>
-{/render}
-                </td>
-              </tr>
-              <tr>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
-                <td>
-                  <input type='submit' name='dhcpEditOptions' value='{t}Edit settings{/t}'>
-                </td>
-              </tr>
-              {/if}
-            </table>
-          </td>
-        </tr>
-        {/if}
       </table>
     </td>
   </tr>
-- 
GitLab


From c65759f4d6f9b5015219f93bc79689e2f3fd295a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 25 Oct 2016 09:11:43 +0200
Subject: [PATCH 18/54] Fixes #5225 Network section display was broken

---
 systems/admin/systems/network.tpl         | 49 +++++++++--------------
 systems/admin/systems/network_section.tpl |  7 +---
 2 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/systems/admin/systems/network.tpl b/systems/admin/systems/network.tpl
index 375ac4c6ca..3b0ad99994 100644
--- a/systems/admin/systems/network.tpl
+++ b/systems/admin/systems/network.tpl
@@ -1,49 +1,36 @@
-<h2><img  class="center"  alt=""  align="middle"  src="geticon.php?context=categories&icon=applications-internet&size=16"> {t}Network  settings{/t}</h2>
-
-
-<table style="width:100%; border-spacing:0; border-collapse:collapse;">
+<table>
   <tr>
-    <td style="width:50%; vertical-align: top;">
-      <table>
-        <tr>
-          <td style='vertical-align:top;'><LABEL  for="ipHostNumber">{t}IP-address{/t}{if $IPisMust}{$must}{/if}</LABEL></td>
-          <td>
+    <td style='vertical-align:top;'><LABEL  for="ipHostNumber">{t}IP-address{/t}{if $IPisMust}{$must}{/if}</LABEL></td>
+    <td>
 {render acl=$ipHostNumberACL}
-            <input  type='text' id="ipHostNumber" name="ipHostNumber" size=25 maxlength=80  value="{$ipHostNumber}">
+      <input  type='text' id="ipHostNumber" name="ipHostNumber" size=25 maxlength=80  value="{$ipHostNumber}">
 {/render}
-          {foreach from=$additionalHostNumbers item=item key=key}
-            <br>
+    {foreach from=$additionalHostNumbers item=item key=key}
+      <br/>
 {render acl=$ipHostNumberACL}
-            <input size=25 maxlength=80 type='text' name='additionalHostNumbers_{$key}' value='{$item}'>
+      <input size=25 maxlength=80 type='text' name='additionalHostNumbers_{$key}' value='{$item}'>
 {/render}
 {render acl=$ipHostNumberACL}
-            <input type='image' class='center' name='additionalHostNumbers_del_{$key}' src='geticon.php?context=actions&icon=edit-delete&size=16' alt='{msgPool type=delButton}'>
+      <input type='image' class='center' name='additionalHostNumbers_del_{$key}' src='geticon.php?context=actions&icon=edit-delete&size=16' alt='{msgPool type=delButton}'>
 {/render}
-          {/foreach}
+    {/foreach}
 {render acl=$ipHostNumberACL}
-          <input type='image' class='center' name='additionalHostNumbers_add}' src='geticon.php?context=actions&icon=document-new&size=16' alt='{msgPool type=addButton}'>&nbsp;
+      <input type='image' class='center' name='additionalHostNumbers_add}' src='geticon.php?context=actions&icon=document-new&size=16' alt='{msgPool type=addButton}'>&nbsp;
 {/render}
-<br>
+      <br/>
 
 {render acl=$ipHostNumberACL}
       <input id="propose_ip" type="submit" name="propose_ip" value="{t}Propose ip{/t}" style="display: none;">
 {/render}
-          </td>
-        </tr>
-        <tr>
-          <td><LABEL  for="macAddress">{t}MAC-address{/t}</LABEL>{if $MACisMust}{$must}{/if}</td>
-          <td>
+    </td>
+  </tr>
+  <tr>
+    <td><LABEL  for="macAddress">{t}MAC-address{/t}</LABEL>{if $MACisMust}{$must}{/if}</td>
+    <td>
 {render acl=$macAddressACL}
-            <input  type='text' name="macAddress" id="macAddress" size=25 maxlength=80  value="{$macAddress}">
+      <input  type='text' name="macAddress" id="macAddress" size=25 maxlength=80  value="{$macAddress}">
 {/render}
-          </td>
-        </tr>
-      </table>
     </td>
   </tr>
 </table>
-<input type="hidden" name="network_tpl_posted" value="1">
-
-<!--
-vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
--->
+<input type="hidden" name="network_tpl_posted" value="1"/>
diff --git a/systems/admin/systems/network_section.tpl b/systems/admin/systems/network_section.tpl
index 3ec6bcf8c4..be0074d58b 100644
--- a/systems/admin/systems/network_section.tpl
+++ b/systems/admin/systems/network_section.tpl
@@ -1,9 +1,4 @@
-<style type="text/css">
-  div.plugin_section#{$sectionId} > div > h2 {literal}{
-    display:none;
-  }{/literal}
-</style>
-<div id="{$sectionId}" class="plugin_section">
+<div id="{$sectionId}" class="plugin-section">
   <span class="legend">
     {$section}
   </span>
-- 
GitLab


From c9d1945bdd51051a5143529d8ca7462ca49ca046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 25 Oct 2016 09:27:42 +0200
Subject: [PATCH 19/54] Fixes #5227 Weird LDAP entry are created when moving a
 DHCP configuration

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index f48c77f560..fa869d443f 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -529,6 +529,7 @@ class dhcpConfiguration extends simplePlugin
     global $config;
     /* Save dhcp settings */
     $ldap   = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
     $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
     $cache  = $this->attributesAccess['dhcpSections']->getCache();
     $errors = array();
-- 
GitLab


From 46da61cb4def8c7ea7fec761ffb03423da044d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 25 Oct 2016 09:41:22 +0200
Subject: [PATCH 20/54] Fixed icons column width in DHCP

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index fa869d443f..b2c325e719 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -107,7 +107,7 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
         'class' => 'center',
       )
     ).'&nbsp;'.$img;
-    $width += 18;
+    $width += 20;
 
     return array ($img, $width);
   }
-- 
GitLab


From 355a455deb01076c3049c6c96d3c483d51a60128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 25 Oct 2016 10:29:15 +0200
Subject: [PATCH 21/54] Fixes #5226 Fixed DHCP dn handling

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index b2c325e719..3dfbdca81b 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -240,6 +240,11 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
     }
   }
 
+  function getGlobalDn ()
+  {
+    return $this->value[0][0];
+  }
+
   /* Subfonction of reload function */
   protected function reload_readItemFromLDAP(&$ldap, $attrs, &$final, $erase)
   {
@@ -519,6 +524,11 @@ class dhcpConfiguration extends simplePlugin
     $this->attributesAccess['dhcpSections']->setHeight(400);
   }
 
+  function compute_dn()
+  {
+    return $this->attributesAccess['dhcpSections']->getGlobalDn();
+  }
+
   protected function shouldSave()
   {
     return TRUE;
-- 
GitLab


From 39a6b2380e065eb2f9b71820330c61b4258aa039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 25 Oct 2016 11:56:57 +0200
Subject: [PATCH 22/54] Fixes various DHCP copy/paste problems

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc | 37 ++++++++++++++-------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index 3dfbdca81b..d77f3ba17e 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -207,7 +207,9 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
   /* Used by dhcpHost */
   function delHost($dn)
   {
-    $this->dhcpObjectCache[$dn] = array();
+    if (($dn != '') && ($dn != 'new')) {
+      $this->dhcpObjectCache[$dn] = array();
+    }
   }
 
   protected function loadAttrValue ($attrs)
@@ -240,9 +242,9 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
     }
   }
 
-  function getGlobalDn ()
+  function getGlobalCn ()
   {
-    return $this->value[0][0];
+    return $this->dhcpObjectCache[$this->value[0][0]]['cn'][0];
   }
 
   /* Subfonction of reload function */
@@ -522,11 +524,19 @@ class dhcpConfiguration extends simplePlugin
     parent::__construct($dn, $object, $parent, $mainTab);
 
     $this->attributesAccess['dhcpSections']->setHeight(400);
+    $this->cn = $this->attributesAccess['dhcpSections']->getGlobalCn();
+  }
+
+  function save_object()
+  {
+    parent::save_object();
+    $this->cn = $this->attributesAccess['dhcpSections']->getGlobalCn();
   }
 
-  function compute_dn()
+  function save()
   {
-    return $this->attributesAccess['dhcpSections']->getGlobalDn();
+    $this->cn = $this->attributesAccess['dhcpSections']->getGlobalCn();
+    return parent::save();
   }
 
   protected function shouldSave()
@@ -543,25 +553,28 @@ class dhcpConfiguration extends simplePlugin
     $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
     $cache  = $this->attributesAccess['dhcpSections']->getCache();
     $errors = array();
+    $new    = ($this->orig_dn == 'new');
     foreach ($cache as $dn => $data) {
-      if ($this->dn != $this->orig_dn) {
+      if (($this->dn != $this->orig_dn) && !$new) {
         $dn = preg_replace('/'.preg_quote($this->orig_dn, '/').'$/i', $this->dn, $dn);
       }
 
       /* Remove entry? */
       if (count($data) == 0) {
-        /* Check if exists, then remove... */
-        if ($ldap->cat($dn)) {
-          $ldap->rmdir_recursive($dn);
-          if (!$ldap->success()) {
-            $errors[] = msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class());
+        if (!$new) {
+          /* Check if exists, then remove... */
+          if ($ldap->cat($dn)) {
+            $ldap->rmdir_recursive($dn);
+            if (!$ldap->success()) {
+              $errors[] = msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class());
+            }
           }
         }
         continue;
       }
 
       /* Modify existing entry? */
-      if (isset($data['MODIFIED']) || $this->orig_dn != $this->dn) {
+      if (isset($data['MODIFIED']) || ($this->orig_dn != $this->dn)) {
         if ($ldap->cat($dn)) {
           $modify = TRUE;
         } else {
-- 
GitLab


From d445d0ab0a37704e357b9646242e301d4401f312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 25 Oct 2016 14:34:01 +0200
Subject: [PATCH 23/54] Fixes #5229 Fixed activation of DHCP tab

---
 dhcp/admin/systems/class_dhcpSystem.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dhcp/admin/systems/class_dhcpSystem.inc b/dhcp/admin/systems/class_dhcpSystem.inc
index a87aa48f54..e5f75a1ab7 100644
--- a/dhcp/admin/systems/class_dhcpSystem.inc
+++ b/dhcp/admin/systems/class_dhcpSystem.inc
@@ -254,6 +254,12 @@ class dhcpSystem extends simplePlugin
     return (count($this->dhcpHosts) > 0);
   }
 
+  function save_object()
+  {
+    parent::save_object();
+    $this->is_account = $this->is_this_account($this->attrs);
+  }
+
   static function getDhcpParentNodes()
   {
     global $config;
-- 
GitLab


From 4d051e0ad390d8f0eefec44d13d4d34e91308814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 25 Oct 2016 16:14:52 +0200
Subject: [PATCH 24/54] Fixes #5198 Adding Mac glue for 1.1 DHCP on old systems

---
 systems/admin/systems/class_workstationGeneric.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/systems/admin/systems/class_workstationGeneric.inc b/systems/admin/systems/class_workstationGeneric.inc
index 093289a0f0..cf35eed430 100644
--- a/systems/admin/systems/class_workstationGeneric.inc
+++ b/systems/admin/systems/class_workstationGeneric.inc
@@ -62,7 +62,7 @@ class systemSimplePluginGlue extends simplePlugin
 
   protected function attributeHaveChanged($field)
   {
-    if ($field == 'ipHostNumber') {
+    if (($name == 'ipHostNumber') || ($name == 'macAddress')) {
       return array_differs($this->attributeInitialValue($field), $this->attributeValue($field));
     } else {
       return parent::attributeHaveChanged($field);
@@ -71,8 +71,8 @@ class systemSimplePluginGlue extends simplePlugin
 
   protected function attributeValue($field)
   {
-    if ($field == 'ipHostNumber') {
-      return $this->ipHostNumber;
+    if (($name == 'ipHostNumber') || ($name == 'macAddress')) {
+      return $this->$name;
     } else {
       return parent::attributeValue($field);
     }
@@ -80,8 +80,8 @@ class systemSimplePluginGlue extends simplePlugin
 
   protected function attributeInitialValue($field)
   {
-    if ($field == 'ipHostNumber') {
-      $initialValue = $this->previousNetworkSavedAttributes['ipHostNumber'];
+    if (($name == 'ipHostNumber') || ($name == 'macAddress')) {
+      $initialValue = $this->previousNetworkSavedAttributes[$name];
       if (is_array($initialValue)) {
         return $initialValue;
       } else {
-- 
GitLab


From a4979161bb62efa297b4ef37d3fc985fdfbb7a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 25 Oct 2016 16:53:47 +0200
Subject: [PATCH 25/54] Fixes #5226 Filling ldap_error to avoid weird error of
 Audit

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index d77f3ba17e..45cef34737 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -547,6 +547,7 @@ class dhcpConfiguration extends simplePlugin
   protected function ldap_save($cleanup = TRUE)
   {
     global $config;
+    $this->ldap_error = 'Success';
     /* Save dhcp settings */
     $ldap   = $config->get_ldap_link();
     $ldap->cd($config->current['BASE']);
@@ -566,6 +567,7 @@ class dhcpConfiguration extends simplePlugin
           if ($ldap->cat($dn)) {
             $ldap->rmdir_recursive($dn);
             if (!$ldap->success()) {
+              $this->ldap_error = $ldap->get_error();
               $errors[] = msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class());
             }
           }
@@ -618,11 +620,13 @@ class dhcpConfiguration extends simplePlugin
         if ($modify) {
           $ldap->modify($attrs);
           if (!$ldap->success()) {
+            $this->ldap_error = $ldap->get_error();
             $errors[] = msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class());
           }
         } else {
           $ldap->add($attrs);
           if (!$ldap->success()) {
+            $this->ldap_error = $ldap->get_error();
             $errors[] = msgPool::ldaperror($ldap->get_error(), $dn, LDAP_ADD, get_class());
           }
         }
-- 
GitLab


From d264ae455855077ae14b046329650006c20159e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 26 Oct 2016 11:30:51 +0200
Subject: [PATCH 26/54] Fixes #5229 fixed var names in systems plugin

---
 systems/admin/systems/class_workstationGeneric.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/systems/admin/systems/class_workstationGeneric.inc b/systems/admin/systems/class_workstationGeneric.inc
index cf35eed430..aafb9762e2 100644
--- a/systems/admin/systems/class_workstationGeneric.inc
+++ b/systems/admin/systems/class_workstationGeneric.inc
@@ -62,7 +62,7 @@ class systemSimplePluginGlue extends simplePlugin
 
   protected function attributeHaveChanged($field)
   {
-    if (($name == 'ipHostNumber') || ($name == 'macAddress')) {
+    if (($field == 'ipHostNumber') || ($field == 'macAddress')) {
       return array_differs($this->attributeInitialValue($field), $this->attributeValue($field));
     } else {
       return parent::attributeHaveChanged($field);
@@ -71,8 +71,8 @@ class systemSimplePluginGlue extends simplePlugin
 
   protected function attributeValue($field)
   {
-    if (($name == 'ipHostNumber') || ($name == 'macAddress')) {
-      return $this->$name;
+    if (($field == 'ipHostNumber') || ($field == 'macAddress')) {
+      return $this->$field;
     } else {
       return parent::attributeValue($field);
     }
@@ -80,8 +80,8 @@ class systemSimplePluginGlue extends simplePlugin
 
   protected function attributeInitialValue($field)
   {
-    if (($name == 'ipHostNumber') || ($name == 'macAddress')) {
-      $initialValue = $this->previousNetworkSavedAttributes[$name];
+    if (($field == 'ipHostNumber') || ($field == 'macAddress')) {
+      $initialValue = $this->previousNetworkSavedAttributes[$field];
       if (is_array($initialValue)) {
         return $initialValue;
       } else {
-- 
GitLab


From 4d31f48f206d5e852a38d7e940e8914365a55a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 26 Oct 2016 11:48:51 +0200
Subject: [PATCH 27/54] Fixes #5231 Removed delete button on global node

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index 45cef34737..bf14e11d99 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -98,6 +98,12 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
   {
     $id = $this->getHtmlId();
     list ($img, $width) = parent::genRowIcons($key, $value);
+
+    if ($key == 0) {
+      /* Remove delete button on first row */
+      $img = preg_replace('/<input[^>]+>&nbsp;$/', '', $img);
+    }
+
     $img = $this->renderInputField(
       'image', $id.'_insertDHCP_'.$key,
       array(
@@ -106,7 +112,7 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
         'alt'   => _('Insert new DHCP section'),
         'class' => 'center',
       )
-    ).'&nbsp;'.$img;
+    ).$img;
     $width += 20;
 
     return array ($img, $width);
-- 
GitLab


From 72f6b1a1efefae834c54c4cc511969a2343c5257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 26 Oct 2016 12:14:17 +0200
Subject: [PATCH 28/54] Fixes #5232 Added failover peer handling

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc   |  6 +-
 .../dhcp/sections/class_dhcpFailOverPeer.inc  | 90 +++++++++++++++++++
 2 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index bf14e11d99..fbad0665dd 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -454,7 +454,7 @@ class dhcpConfiguration extends simplePlugin
   static $sectionMap = array(
     'dhcpService'       => array(
       'dhcpSharedNetwork','dhcpSubnet','dhcpGroup',
-      'dhcpHost','dhcpClass','dhcpTSigKey','dhcpDnsZone'
+      'dhcpHost','dhcpClass','dhcpTSigKey','dhcpDnsZone','dhcpFailOverPeer'
     ),
     'dhcpClass'         => array('dhcpSubClass'),
     'dhcpSubClass'      => array(),
@@ -463,9 +463,9 @@ class dhcpConfiguration extends simplePlugin
     'dhcpPool'          => array(),
     'dhcpSubnet'        => array(
       'dhcpPool','dhcpGroup',
-      'dhcpHost','dhcpClass','dhcpTSigKey','dhcpDnsZone'
+      'dhcpHost','dhcpClass','dhcpTSigKey','dhcpDnsZone','dhcpFailOverPeer'
     ),
-    'dhcpSharedNetwork' => array('dhcpSubnet', 'dhcpPool','dhcpTSigKey','dhcpDnsZone'),
+    'dhcpSharedNetwork' => array('dhcpSubnet', 'dhcpPool','dhcpTSigKey','dhcpDnsZone','dhcpFailOverPeer'),
     'dhcpTSigKey'       => array(),
     'dhcpDnsZone'       => array()
   );
diff --git a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
new file mode 100644
index 0000000000..dc1f193e1e
--- /dev/null
+++ b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
@@ -0,0 +1,90 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class dhcpFailOverPeer extends dhcpPlugin
+{
+  public $objectclasses = array('dhcpFailOverPeer');
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('DHCP'),
+        'attrs' => array(
+          new HostNameAttribute (
+            _('Name'), _('Name of this DHCP configuration'),
+            'cn', TRUE
+          ),
+          new StringAttribute (
+            _('Primary server'), _('IP address or DNS name of the server playing primary role in DHC Load Balancing and Fail over'),
+            'dhcpFailOverPrimaryServer', TRUE
+          ),
+          new IntAttribute (
+            _('Primary port'), _('Port on which primary server listens for connections from its fail over peer (secondary server)'),
+            'dhcpFailOverPrimaryPort', TRUE,
+            0, FALSE
+          ),
+          new StringAttribute (
+            _('Secondary server'), _('IP address or DNS name of the server playing secondary role in DHC Load Balancing and Fail over'),
+            'dhcpFailOverSecondaryServer', TRUE
+          ),
+          new IntAttribute (
+            _('Secondary port'), _('Port on which secondary server listens for connections from its fail over peer (primary server)'),
+            'dhcpFailOverSecondaryPort', TRUE,
+            0, FALSE
+          ),
+          new TimeAttribute (
+            _('Response delay'), _('Maximum response time in seconds, before Server assumes that connection to fail over peer has failed'),
+            'dhcpFailOverResponseDelay', FALSE,
+            0, FALSE
+          ),
+          new IntAttribute (
+            _('Unacked updates'), _('Number of BNDUPD messages that server can send before it receives BNDACK from its fail over peer'),
+            'dhcpFailOverUnackedUpdates', FALSE,
+            0, FALSE
+          ),
+          new TimeAttribute (
+            _('Maximum Client Lead Time'), _('Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]'),
+            'dhcpMaxClientLeadTime', FALSE,
+            0, FALSE
+          ),
+          new IntAttribute (
+            _('Split'), _('Split between the primary and secondary servers for fail over purpose'),
+            'dhcpFailOverSplit', FALSE,
+            0, FALSE
+          ),
+          new StringAttribute (
+            _('HashBucketAssignment'), _('HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074]'),
+            'dhcpHashBucketAssignment', FALSE
+          ),
+          new TimeAttribute (
+            _('Load balance time'), _('Cutoff time in seconds, after which load balance is disabled'),
+            'dhcpFailOverLoadBalanceTime', FALSE,
+            0, FALSE
+          ),
+          new TextAreaAttribute (
+            _('Comments'), _('Comments about this DHCP object'),
+            'dhcpComments', FALSE
+          ),
+        )
+      )
+    );
+  }
+}
-- 
GitLab


From 5c158dfde267872d5d57437979cf01ac5fc5d88c Mon Sep 17 00:00:00 2001
From: Mortier Benoit <benoit.mortier@opensides.be>
Date: Wed, 26 Oct 2016 15:09:01 +0200
Subject: [PATCH 29/54] Fixes: #5233 Remove ppolicydefault.ldif and
 dhcpd.schema from source

Signed-off-by: Mortier Benoit <benoit.mortier@opensides.be>
---
 dhcp/contrib/openldap/dhcp.schema            | 462 -------------------
 ppolicy/contrib/openldap/ppolicydefault.ldif |  20 -
 2 files changed, 482 deletions(-)
 delete mode 100644 dhcp/contrib/openldap/dhcp.schema
 delete mode 100644 ppolicy/contrib/openldap/ppolicydefault.ldif

diff --git a/dhcp/contrib/openldap/dhcp.schema b/dhcp/contrib/openldap/dhcp.schema
deleted file mode 100644
index c5ed6c723a..0000000000
--- a/dhcp/contrib/openldap/dhcp.schema
+++ /dev/null
@@ -1,462 +0,0 @@
-attributetype ( 2.16.840.1.113719.1.203.4.1 
-	NAME 'dhcpPrimaryDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The DN of the dhcpServer which is the primary server for the configuration.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.2 
-	NAME 'dhcpSecondaryDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The DN of dhcpServer(s) which provide backup service for the configuration.'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.3 
-	NAME 'dhcpStatements' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'Flexible storage for specific data depending on what object this exists in. Like conditional statements, server parameters, etc. This allows the standard to evolve without needing to adjust the schema.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.4 
-	NAME 'dhcpRange' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'The starting & ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen.  Each range is defined as a separate value.'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.5 
-	NAME 'dhcpPermitList' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.6 
-	NAME 'dhcpNetMask' 
-	EQUALITY integerMatch
-	DESC 'The subnet mask length for the subnet.  The mask can be easily computed from this length.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.7 
-	NAME 'dhcpOption' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'Encoded option values to be sent to clients.  Each value represents a single option and contains (OptionTag, Length, OptionValue) encoded in the format used by DHCP.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.8 
-	NAME 'dhcpClassData' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'Encoded text string or list of bytes expressed in hexadecimal, separated by colons.  Clients match subclasses based on matching the class data with the results of match or spawn with statements in the class name declarations.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.9 
-	NAME 'dhcpOptionsDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The distinguished name(s) of the dhcpOption objects containing the configuration options provided by the server.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.10 
-	NAME 'dhcpHostDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'the distinguished name(s) of the dhcpHost objects.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) 
-
-attributetype ( 2.16.840.1.113719.1.203.4.11 
-	NAME 'dhcpPoolDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The distinguished name(s) of pools.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.12 
-	NAME 'dhcpGroupDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The distinguished name(s)   of the groups.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.13 
-	NAME 'dhcpSubnetDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The distinguished name(s) of the subnets.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.14 
-	NAME 'dhcpLeaseDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The distinguished name of a client address.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE)
-
-attributetype ( 2.16.840.1.113719.1.203.4.15 
-	NAME 'dhcpLeasesDN' 
-	DESC 'The distinguished name(s) client addresses.' 
-	EQUALITY distinguishedNameMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.16 
-	NAME 'dhcpClassesDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The distinguished name(s) of a class(es) in a subclass.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.17 
-	NAME 'dhcpSubclassesDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The distinguished name(s) of subclass(es).' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.18 
-	NAME 'dhcpSharedNetworkDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The distinguished name(s) of sharedNetworks.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.19 
-	NAME 'dhcpServiceDN' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The DN of dhcpService object(s)which contain the configuration information. Each dhcpServer object has this attribute identifying the DHCP configuration(s) that the server is associated with.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.20 
-	NAME 'dhcpVersion'
-	DESC 'The version attribute of this object.'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.21 
-	NAME 'dhcpImplementation' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'Description of the DHCP Server implementation e.g. DHCP Servers vendor.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.22 
-	NAME 'dhcpAddressState' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'This stores information about the current binding-status of an address.  For dynamic addresses managed by DHCP, the values should be restricted to the following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET", "ABANDONED", "BACKUP".  For other addresses, it SHOULD be one of the following: "UNKNOWN", "RESERVED" (an address that is managed by DHCP that is reserved for a specific client), "RESERVED-ACTIVE" (same as reserved, but address is currently in use), "ASSIGNED" (assigned manually or by some other mechanism), "UNASSIGNED", "NOTASSIGNABLE".'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.23 
-	NAME 'dhcpExpirationTime' 
-	EQUALITY generalizedTimeMatch 
-	DESC 'This is the time the current lease for an address expires.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.24 
-	NAME 'dhcpStartTimeOfState' 
-	EQUALITY generalizedTimeMatch 
-	DESC 'This is the time of the last state change for a leased address.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.25 
-	NAME 'dhcpLastTransactionTime' 
-	EQUALITY generalizedTimeMatch 
-	DESC 'This is the last time a valid DHCP packet was received from the client.'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.26 
-	NAME 'dhcpBootpFlag' 
-	EQUALITY booleanMatch 
-	DESC 'This indicates whether the address was assigned via BOOTP.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.27 
-	NAME 'dhcpDomainName' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'This is the name of the domain sent to the client by the server.  It is essentially the same as the value for DHCP option 15 sent to the client, and represents only the domain - not the full FQDN.  To obtain the full FQDN assigned to the client you must prepend the "dhcpAssignedHostName" to this value with a ".".' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.28 
-	NAME 'dhcpDnsStatus' 
-	EQUALITY integerMatch
-	DESC 'This indicates the status of updating DNS resource records on behalf of the client by the DHCP server for this address.  The value is a 16-bit bitmask.'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.29 
-	NAME 'dhcpRequestedHostName' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'This is the hostname that was requested by the client.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.30 
-	NAME 'dhcpAssignedHostName' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'This is the actual hostname that was assigned to a client. It may not be the name that was requested by the client.  The fully qualified domain name can be determined by appending the value of "dhcpDomainName" (with a dot separator) to this name.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.31 
-	NAME 'dhcpReservedForClient' 
-	EQUALITY distinguishedNameMatch
-	DESC 'The distinguished name of a "dhcpClient" that an address is reserved for.  This may not be the same as the "dhcpAssignedToClient" attribute if the address is being reassigned but the current lease has not yet expired.'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.32 
-	NAME 'dhcpAssignedToClient' 
-	EQUALITY distinguishedNameMatch
-	DESC 'This is the distinguished name of a "dhcpClient" that an address is currently assigned to.  This attribute is only present in the class when the address is leased.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.33 
-	NAME 'dhcpRelayAgentInfo' 
-	EQUALITY octetStringMatch
-	DESC 'If the client request was received via a relay agent, this contains information about the relay agent that was available from the DHCP request.  This is a hex-encoded option value.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.34 
-	NAME 'dhcpHWAddress' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'The clients hardware address that requested this IP address.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.35 
-	NAME 'dhcpHashBucketAssignment' 
-	EQUALITY octetStringMatch
-	DESC 'HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074].' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.36 
-	NAME 'dhcpDelayedServiceParameter' 
-	EQUALITY integerMatch
-	DESC 'Delay in seconds corresponding to Delayed Service Parameter configuration, as defined in  DHC Load Balancing Algorithm [RFC 3074]. '
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.37 
-	NAME 'dhcpMaxClientLeadTime' 
-	EQUALITY integerMatch
-	DESC 'Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.38 
-	NAME 'dhcpFailOverEndpointState' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR]' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.39 
-	NAME 'dhcpErrorLog' 
-	EQUALITY caseIgnoreIA5Match
-	DESC 'Generic error log attribute that allows logging error conditions within a dhcpService or a dhcpSubnet, like no IP addresses available for lease.'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.40 
-	NAME 'dhcpLocatorDN' 
-	EQUALITY distinguishedNameMatch 
-	DESC 'The DN of dhcpLocator object which contain the DNs of all DHCP configuration objects. There will be a single dhcpLocator object in the tree with links to all the DHCP objects in the tree' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype  ( 2.16.840.1.113719.1.203.4.41 
-	NAME 'dhcpKeyAlgorithm' 
-	EQUALITY caseIgnoreIA5Match 
-	DESC 'Algorithm to generate TSIG Key' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype  ( 2.16.840.1.113719.1.203.4.42 
-	NAME 'dhcpKeySecret' 
-	EQUALITY octetStringMatch 
-	DESC 'Secret to generate TSIG Key' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.43 
-	NAME 'dhcpDnsZoneServer' 
-	EQUALITY caseIgnoreIA5Match 
-	DESC 'Master server of the DNS Zone' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-attributetype ( 2.16.840.1.113719.1.203.4.44 
-	NAME 'dhcpKeyDN' 
-	EQUALITY distinguishedNameMatch 
-	DESC 'The DNs of TSIG Key to use in secure dynamic updates. In case of locator object, this will be list of TSIG keys.  In case of DHCP Service, Shared Network, Subnet and DNS Zone, it will be a single key.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
-
-attributetype ( 2.16.840.1.113719.1.203.4.45 
-	NAME 'dhcpZoneDN' 
-	EQUALITY distinguishedNameMatch 
-	DESC 'The DNs of DNS Zone. In case of locator object, this will be list of DNS Zones in the tree. In case of DHCP Service, Shared Network and Subnet, it will be a single DNS Zone.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
-
-attributetype ( 2.16.840.1.113719.1.203.4.46 
-	NAME 'dhcpFailOverPrimaryServer' 
-	EQUALITY caseIgnoreIA5Match 
-	DESC 'IP address or DNS name of the server playing primary role in DHC Load Balancing and Fail over.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26  )
-
-attributetype ( 2.16.840.1.113719.1.203.4.47 
-	NAME 'dhcpFailOverSecondaryServer' 
-	EQUALITY caseIgnoreIA5Match 
-	DESC 'IP address or DNS name of the server playing secondary role in DHC Load Balancing and Fail over.' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26  )
-
-attributetype ( 2.16.840.1.113719.1.203.4.48
-	NAME 'dhcpFailOverPrimaryPort' 
-	EQUALITY integerMatch 
-	DESC 'Port on which primary server listens for connections from its fail over peer (secondary server)' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
-	
-attributetype ( 2.16.840.1.113719.1.203.4.49
-	NAME 'dhcpFailOverSecondaryPort' 
-	EQUALITY integerMatch 
-	DESC 'Port on which secondary server listens for connections from its fail over peer (primary server)' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
-
-attributetype ( 2.16.840.1.113719.1.203.4.50
-	NAME 'dhcpFailOverResponseDelay' 
-	EQUALITY integerMatch 
-	DESC 'Maximum response time in seconds, before Server assumes that connection to fail over peer has failed' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
-
-attributetype ( 2.16.840.1.113719.1.203.4.51
-	NAME 'dhcpFailOverUnackedUpdates' 
-	EQUALITY integerMatch 
-	DESC 'Number of BNDUPD messages that server can send before it receives BNDACK from its fail over peer' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
-
-attributetype ( 2.16.840.1.113719.1.203.4.52
-	NAME 'dhcpFailOverSplit' 
-	EQUALITY integerMatch 
-	DESC 'Split between the primary and secondary servers for fail over purpose' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
-
-attributetype ( 2.16.840.1.113719.1.203.4.53
-	NAME 'dhcpFailOverLoadBalanceTime' 
-	EQUALITY integerMatch 
-	DESC 'Cutoff time in seconds, after which load balance is disabled' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
-
-attributetype ( 2.16.840.1.113719.1.203.4.54
-	NAME 'dhcpFailOverPeerDN' 
-	EQUALITY distinguishedNameMatch 
-	DESC 'The DNs of Fail over peers. In case of locator object, this will be list of fail over peers in the tree. In case of Subnet and pool, it will be a single Fail Over Peer' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) 
-
-#List of all servers in the tree
-attributetype ( 2.16.840.1.113719.1.203.4.55
-	NAME 'dhcpServerDN' 
-	EQUALITY distinguishedNameMatch 
-	DESC 'List of all  DHCP Servers in the tree. Used by dhcpLocatorObject' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.16.840.1.113719.1.203.4.56
-	NAME 'dhcpComments' 
-	EQUALITY caseIgnoreIA5Match 
-	DESC 'Generic attribute that allows coments  within any DHCP object' 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-
-# Classes
-
-objectclass ( 2.16.840.1.113719.1.203.6.1 
-	NAME 'dhcpService' 
-	DESC 'Service object that represents the actual DHCP Service configuration. This is a container object.' 
-	SUP top 
-	MUST (cn) 
-	MAY ( dhcpPrimaryDN $ dhcpSecondaryDN $ dhcpServerDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpGroupDN $ dhcpHostDN $  dhcpClassesDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpKeyDN $ dhcpFailOverPeerDN $ dhcpStatements $dhcpComments $ dhcpOption) )
-
-objectclass ( 2.16.840.1.113719.1.203.6.2 
-	NAME 'dhcpSharedNetwork' 
-	DESC 'This stores configuration information for a shared network.' 
-	SUP top 
-	MUST cn 
-	MAY ( dhcpSubnetDN $ dhcpPoolDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpStatements $dhcpComments $ dhcpOption) X-NDS_CONTAINMENT ('dhcpService' ) )
-
-objectclass ( 2.16.840.1.113719.1.203.6.3 
-	NAME 'dhcpSubnet' 
-	DESC 'This class defines a subnet. This is a container object.' 
-	SUP top 
-	MUST ( cn $ dhcpNetMask ) 
-	MAY ( dhcpRange $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $ dhcpClassesDN $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpKeyDN $ dhcpFailOverPeerDN $ dhcpStatements $ dhcpComments $ dhcpOption ) X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork') )
-
-objectclass ( 2.16.840.1.113719.1.203.6.4 
-	NAME 'dhcpPool' 
-	DESC 'This stores configuration information about a pool.' 
-	SUP top 
-	MUST ( cn $ dhcpRange ) 
-	MAY ( dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $dhcpKeyDN $ dhcpStatements $ dhcpComments $ dhcpOption ) 
-	X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') )
-
-objectclass ( 2.16.840.1.113719.1.203.6.5 
-	NAME 'dhcpGroup' 
-	DESC 'Group object that lists host DNs and parameters. This is a container object.' 
-	SUP top 
-	MUST cn 
-	MAY ( dhcpHostDN $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption )
-	X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpService' ) )
-
-objectclass ( 2.16.840.1.113719.1.203.6.6 
-	NAME 'dhcpHost' 
-	DESC 'This represents information about a particular client' 
-	SUP top 
-	MUST cn 
-	MAY  (dhcpLeaseDN $ dhcpHWAddress $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption) 
-	X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' 'dhcpGroup') )
-
-objectclass ( 2.16.840.1.113719.1.203.6.7 
-	NAME 'dhcpClass' 
-	DESC 'Represents information about a collection of related clients.' 
-	SUP top 
-	MUST cn 
-	MAY (dhcpSubClassesDN $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption) 
-	X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' ) )
-
-objectclass ( 2.16.840.1.113719.1.203.6.8 
-	NAME 'dhcpSubClass' 
-	DESC 'Represents information about a collection of related classes.' 
-	SUP top 
-	MUST cn 
-	MAY (dhcpClassData $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption) X-NDS_CONTAINMENT 'dhcpClass' )
-
-objectclass ( 2.16.840.1.113719.1.203.6.9 
-	NAME 'dhcpOptions' 
-	DESC 'Represents information about a collection of options defined.' 
-	SUP top AUXILIARY
-	MUST cn 
-	MAY ( dhcpOption $ dhcpComments ) 
-	X-NDS_CONTAINMENT  ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet' 'dhcpPool' 'dhcpGroup' 'dhcpHost' 'dhcpClass' ) )
-
-objectclass ( 2.16.840.1.113719.1.203.6.10 
-	NAME 'dhcpLeases' 
-	DESC 'This class represents an IP Address, which may or may not have been leased.' 
-	SUP top 
-	MUST ( cn $ dhcpAddressState ) 
-	MAY ( dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress ) 
-	X-NDS_CONTAINMENT ( 'dhcpService' 'dhcpSubnet' 'dhcpPool') )
-
-objectclass ( 2.16.840.1.113719.1.203.6.11 
-	NAME 'dhcpLog' 
-	DESC 'This is the object that holds past information about the IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released.' 
-	SUP top 
-	MUST ( cn ) 
-	MAY ( dhcpAddressState $ dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress $ dhcpErrorLog) 
-	X-NDS_CONTAINMENT ('dhcpLeases' 'dhcpPool' 'dhcpSubnet' 'dhcpSharedNetwork' 'dhcpService' ) )
-
-objectclass ( 2.16.840.1.113719.1.203.6.12 
-	NAME 'dhcpServer' 
-	DESC 'DHCP Server Object' 
-	SUP top 
-	MUST ( cn ) 
-	MAY (dhcpServiceDN  $ dhcpLocatorDN $ dhcpVersion $ dhcpImplementation $ dhcpHashBucketAssignment $ dhcpDelayedServiceParameter $ dhcpMaxClientLeadTime $ dhcpFailOverEndpointState $ dhcpStatements $ dhcpComments $ dhcpOption) 
-	X-NDS_CONTAINMENT ('organization' 'organizationalunit' 'domain') )
-
-objectclass ( 2.16.840.1.113719.1.203.6.13 
-	NAME 'dhcpTSigKey' 
-	DESC 'TSIG key for secure dynamic updates' 
-	SUP top 
-	MUST (cn $ dhcpKeyAlgorithm $ dhcpKeySecret ) 
-	MAY ( dhcpComments ) 
-	X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet') )
-
-objectclass ( 2.16.840.1.113719.1.203.6.14 
-	NAME 'dhcpDnsZone' 
-	DESC 'DNS Zone for updating leases' 
-	SUP top 
-	MUST (cn $ dhcpDnsZoneServer ) 
-	MAY (dhcpKeyDN $ dhcpComments) 
-	X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet') )
-
-objectclass ( 2.16.840.1.113719.1.203.6.15 
-	NAME 'dhcpFailOverPeer' 
-	DESC 'This class defines the Fail over peer' 
-	SUP top 
-  MUST ( cn $ dhcpFailOverPrimaryServer $ dhcpFailOverSecondaryServer $ dhcpFailoverPrimaryPort $ dhcpFailOverSecondaryPort) MAY (dhcpFailOverResponseDelay  $ dhcpFailOverUnackedUpdates $ dhcpMaxClientLeadTime $ dhcpFailOverSplit $ dhcpHashBucketAssignment $ dhcpFailOverLoadBalanceTime $ dhcpComments ) 
-	X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet') )
-
-objectclass ( 2.16.840.1.113719.1.203.6.16 
-	NAME 'dhcpLocator' 
-	DESC 'Locator object for DHCP configuration in the tree. There will be a single dhcpLocator object in the tree with links to all the DHCP objects in the tree' 
-	SUP top 
-	MUST ( cn ) 
-	MAY ( dhcpServiceDN $dhcpServerDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $  dhcpClassesDN $ dhcpKeyDN $ dhcpZoneDN $ dhcpFailOverPeerDN $ dhcpOption $ dhcpComments) 
-	X-NDS_CONTAINMENT ('organization' 'organizationalunit' 'domain') )
-
-
diff --git a/ppolicy/contrib/openldap/ppolicydefault.ldif b/ppolicy/contrib/openldap/ppolicydefault.ldif
deleted file mode 100644
index 4f08a027f2..0000000000
--- a/ppolicy/contrib/openldap/ppolicydefault.ldif
+++ /dev/null
@@ -1,20 +0,0 @@
-dn: cn=default, ou=ppolicies, dc=fusiondirectory,dc=org
-objectClass: top
-objectClass: device
-objectClass: pwdPolicy
-cn: default
-pwdAttribute: userPassword
-pwdMaxAge: 7776000
-pwdMinAge: 86400
-pwdExpireWarning: 864000
-pwdInHistory: 4
-pwdMinLength: 8
-pwdMaxFailure: 5
-pwdLockout: TRUE
-pwdLockoutDuration: 900
-pwdGraceAuthNLimit: 5
-pwdFailureCountInterval: 0
-pwdMustChange: TRUE
-pwdAllowUserChange: TRUE
-pwdSafeModify: FALSE
-pwdCheckQuality: 1
-- 
GitLab


From 04fbf963b28b6cd9b045cd7ffc79394ab5016817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Fri, 26 Aug 2016 17:00:41 +0200
Subject: [PATCH 30/54] Fixed errors spotted by SonarQube

---
 fai/admin/fai/class_faiPackageConfiguration.inc | 2 +-
 opsi/admin/opsi/class_opsiProductProperties.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fai/admin/fai/class_faiPackageConfiguration.inc b/fai/admin/fai/class_faiPackageConfiguration.inc
index 8db332ba81..fe2d3a0262 100644
--- a/fai/admin/fai/class_faiPackageConfiguration.inc
+++ b/fai/admin/fai/class_faiPackageConfiguration.inc
@@ -48,7 +48,7 @@ class faiPackageConfiguration extends simplePlugin
       @param  String  The release name (e.g. edge)
       @param  Array   The current package configuration.
    */
-  function __construct($dn = NULL, $packageName, $release, $values)
+  function __construct($dn, $packageName, $release, $values)
   {
     $this->packageName  = $packageName;
 
diff --git a/opsi/admin/opsi/class_opsiProductProperties.inc b/opsi/admin/opsi/class_opsiProductProperties.inc
index 9eda7b6803..b1c5f4c216 100644
--- a/opsi/admin/opsi/class_opsiProductProperties.inc
+++ b/opsi/admin/opsi/class_opsiProductProperties.inc
@@ -20,9 +20,9 @@
 
 class SubmittingOPSIProductAttribute extends SelectAttribute
 {
-  function __construct ($label, $description, $ldapName, $required = FALSE, $func, $acl = "")
+  function __construct ($label, $description, $ldapName, $required, $func, $acl = '')
   {
-    parent::__construct($label, $description, $ldapName, $required, array(), "", NULL, $acl);
+    parent::__construct($label, $description, $ldapName, $required, array(), '', NULL, $acl);
     $this->setSubmitForm($func);
   }
 
-- 
GitLab


From a25c24665ce9e90f5e6ada378af11b78aa71366e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 26 Oct 2016 17:29:42 +0200
Subject: [PATCH 31/54] Fixes #5232 failover peer also needed to be added is
 section list

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index fbad0665dd..e3259f8809 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -466,6 +466,7 @@ class dhcpConfiguration extends simplePlugin
       'dhcpHost','dhcpClass','dhcpTSigKey','dhcpDnsZone','dhcpFailOverPeer'
     ),
     'dhcpSharedNetwork' => array('dhcpSubnet', 'dhcpPool','dhcpTSigKey','dhcpDnsZone','dhcpFailOverPeer'),
+    'dhcpFailOverPeer'  => array(),
     'dhcpTSigKey'       => array(),
     'dhcpDnsZone'       => array()
   );
-- 
GitLab


From fca4955ce24e9eb29e50a5ae4c748c8de9b73ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Fri, 28 Oct 2016 11:19:54 +0200
Subject: [PATCH 32/54] =?UTF-8?q?Fixed=20CSS=C2=A0class=20in=20serverServi?=
 =?UTF-8?q?ce?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 systems/admin/systems/serverService-list.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/systems/admin/systems/serverService-list.tpl b/systems/admin/systems/serverService-list.tpl
index e413c69d76..c0b12daaf9 100644
--- a/systems/admin/systems/serverService-list.tpl
+++ b/systems/admin/systems/serverService-list.tpl
@@ -1,4 +1,4 @@
-<table class="listing_container">
+<table class="listing-container">
   <tbody>
     <tr>
       <td class="list">
@@ -6,7 +6,7 @@
           <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
         </div>
 
-        <div class="contentboxb" style="background:white;">
+        <div class="contentboxb">
           <table>
             <tbody>
               <tr>
-- 
GitLab


From 3279a4a2bc32348f1e50bef6ca332d7de0ac591e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Fri, 28 Oct 2016 11:59:39 +0200
Subject: [PATCH 33/54] Fixes #5198 Setting dhcpPrimaryDN on dhcp configuration
 as needed

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc        | 11 +++++++++++
 dhcp/admin/dhcp/sections/class_dhcpService.inc     |  1 +
 .../systems/services/dhcp/class_serviceDHCP.inc    | 14 ++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index e3259f8809..9f2a6d4906 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -253,6 +253,12 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
     return $this->dhcpObjectCache[$this->value[0][0]]['cn'][0];
   }
 
+  public function setPrimaryDn ($dn)
+  {
+    $this->value[0]['dhcpPrimaryDN']  = array($dn);
+    $this->value[0]['MODIFIED']       = TRUE;
+  }
+
   /* Subfonction of reload function */
   protected function reload_readItemFromLDAP(&$ldap, $attrs, &$final, $erase)
   {
@@ -645,4 +651,9 @@ class dhcpConfiguration extends simplePlugin
     //~ parent::ldap_save();
     return !empty($errors);
   }
+
+  public function setPrimaryServer($dn)
+  {
+    $this->attributesAccess['dhcpSections']->setPrimaryDn($dn);
+  }
 }
diff --git a/dhcp/admin/dhcp/sections/class_dhcpService.inc b/dhcp/admin/dhcp/sections/class_dhcpService.inc
index a25a3d1df1..dc1e8982e0 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpService.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpService.inc
@@ -33,6 +33,7 @@ class dhcpService extends dhcpPlugin
         'ddns-update-style none'
       )
     );
+    $attributesInfo['main']['attrs'][] = new HiddenAttribute('dhcpPrimaryDN');
     return $attributesInfo;
   }
 }
diff --git a/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc b/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
index bc58abdb15..5470ccae0d 100644
--- a/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
+++ b/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
@@ -65,8 +65,18 @@ class serviceDHCP extends simpleService
     $attributesInfo['main']['attrs'][0]->attribute->setChoices(array_keys($services), array_values($services));
     parent::__construct($dn, $parent, $attributesInfo);
 
-    // TODO: On save fill dhcpPrimaryDn on the dhcpService objects
-    // Also add a foreign key
+    // TODO: add a foreign key
+  }
+
+  function ldap_save()
+  {
+    parent::ldap_save();
+    $dhcpServiceDN = $this->dhcpServiceDN;
+    foreach ($dhcpServiceDN as $dn) {
+      $tabObject = objects::open($dn, 'dhcpConfiguration');
+      $tabObject->getBaseObject()->setPrimaryServer($this->dn);
+      $tabObject->save();
+    }
   }
 }
 ?>
-- 
GitLab


From 3994651f12f984b56a61fe0e230a40af0fb09a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Fri, 28 Oct 2016 12:03:47 +0200
Subject: [PATCH 34/54] Fixes #5198 Setting dhcpPrimaryDN on dhcp configuration
 as needed

---
 dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc b/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
index 5470ccae0d..1bb3fbef04 100644
--- a/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
+++ b/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
@@ -68,9 +68,9 @@ class serviceDHCP extends simpleService
     // TODO: add a foreign key
   }
 
-  function ldap_save()
+  function ldap_save($cleanup = TRUE)
   {
-    parent::ldap_save();
+    parent::ldap_save($cleanup);
     $dhcpServiceDN = $this->dhcpServiceDN;
     foreach ($dhcpServiceDN as $dn) {
       $tabObject = objects::open($dn, 'dhcpConfiguration');
-- 
GitLab


From 803af44fccbf2a1b8d353123be3c3b21a34a57e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Fri, 28 Oct 2016 14:30:31 +0200
Subject: [PATCH 35/54] Fixes #5198 fixed primary server dn setting

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index 9f2a6d4906..8c29cd8fad 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -255,8 +255,8 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
 
   public function setPrimaryDn ($dn)
   {
-    $this->value[0]['dhcpPrimaryDN']  = array($dn);
-    $this->value[0]['MODIFIED']       = TRUE;
+    $this->dhcpObjectCache[$this->value[0][0]]['dhcpPrimaryDN']  = array($dn);
+    $this->dhcpObjectCache[$this->value[0][0]]['MODIFIED']       = TRUE;
   }
 
   /* Subfonction of reload function */
@@ -603,7 +603,7 @@ class dhcpConfiguration extends simplePlugin
             continue;
           }
 
-          if (in_array($attribute, array('dhcpPrimaryDN','dhcpSecondaryDN','dhcpServerDN','dhcpFailOverPeerDN'))) {
+          if (in_array($attribute, array('dhcpServerDN','dhcpFailOverPeerDN'))) {
             foreach ($values as $v_key => $value) {
               $values[$v_key] = preg_replace('/'.preg_quote($this->orig_dn, '/').'$/i', $this->dn, $value);
             }
-- 
GitLab


From 8405647bfd6235a8b03b9fe95f2de66ee63b510b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Tue, 6 Sep 2016 15:17:16 +0200
Subject: [PATCH 36/54] Fixes #4953 nisObject cn can contain /

---
 autofs/admin/autofs/class_nisObject.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/autofs/admin/autofs/class_nisObject.inc b/autofs/admin/autofs/class_nisObject.inc
index 8f6e797e86..d1f5e22579 100644
--- a/autofs/admin/autofs/class_nisObject.inc
+++ b/autofs/admin/autofs/class_nisObject.inc
@@ -54,9 +54,11 @@ class nisObject extends simplePlugin
         'name'  => _('Directory'),
         'attrs' => array(
           new BaseSelectorAttribute(get_ou('autofsRDN')),
-          new HostNameAttribute (
+          new StringAttribute (
             _('Name'), _('Name of this directory'),
-            'cn', TRUE
+            'cn', TRUE,
+            '', '',
+            '/^[a-z0-9\.\-/]*$/i', 'nfsPartage'
           ),
           new TextAreaAttribute (
             _('Automount entry'), _("The entry of this directory for the automount daemon.\n For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"),
-- 
GitLab


From 8e27c79be32494abf02e10e39e1819fc6e13c54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Tue, 6 Sep 2016 15:55:55 +0200
Subject: [PATCH 37/54] Fixes #4953 nisObject cn can contain /

---
 autofs/admin/autofs/class_nisObject.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autofs/admin/autofs/class_nisObject.inc b/autofs/admin/autofs/class_nisObject.inc
index d1f5e22579..f14bce45ee 100644
--- a/autofs/admin/autofs/class_nisObject.inc
+++ b/autofs/admin/autofs/class_nisObject.inc
@@ -58,7 +58,7 @@ class nisObject extends simplePlugin
             _('Name'), _('Name of this directory'),
             'cn', TRUE,
             '', '',
-            '/^[a-z0-9\.\-/]*$/i', 'nfsPartage'
+            '/^[a-z0-9\.\-\/]*$/i', 'nfsPartage'
           ),
           new TextAreaAttribute (
             _('Automount entry'), _("The entry of this directory for the automount daemon.\n For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"),
-- 
GitLab


From abf291885c49303c459b860b3a33e5c571f7f1d5 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Mon, 7 Nov 2016 08:08:41 +0100
Subject: [PATCH 38/54] Removing commented code left from 1.1 conversion

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index 8c29cd8fad..881aa50585 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -54,7 +54,6 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
       return array('not in cache',$dn,'');
     }
 
-    //~ $link = "<a href='?plug=".$_GET['plug']."&act=edit&id=".$key."'>".$value[1]."</a>";
     $link = $value[1];
 
     $objtype = $this->objectType($dn);
@@ -648,7 +647,6 @@ class dhcpConfiguration extends simplePlugin
 
     msg_dialog::displayChecks($errors);
 
-    //~ parent::ldap_save();
     return !empty($errors);
   }
 
-- 
GitLab


From 9a17e067c602e467c86a94f9cf63e87b7173d01b Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Mon, 7 Nov 2016 08:13:44 +0100
Subject: [PATCH 39/54] Removing commented code left from 1.1 conversion

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 dhcp/admin/systems/class_dhcpSystem.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dhcp/admin/systems/class_dhcpSystem.inc b/dhcp/admin/systems/class_dhcpSystem.inc
index e5f75a1ab7..0990718053 100644
--- a/dhcp/admin/systems/class_dhcpSystem.inc
+++ b/dhcp/admin/systems/class_dhcpSystem.inc
@@ -168,7 +168,6 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
     }
 
     $valueHashes    = array_flip(array_map('join', $values));
-    //~ $iValueHashes   = array_flip(array_map('join', $iValues));
     foreach ($iValues as $value) {
       $hash = join($value);
       if (isset($valueHashes[$hash]) && !$fullrewrite) {
-- 
GitLab


From 83d3f5221f3b53331be3b224a10c212511b74e73 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Mon, 7 Nov 2016 22:16:37 +0100
Subject: [PATCH 40/54] Updated locales for 1.0.17

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 alias/locale/ar/fusiondirectory.po            |  130 +-
 alias/locale/ca/fusiondirectory.po            |  130 +-
 alias/locale/cs_CZ/fusiondirectory.po         |  148 +-
 alias/locale/de/fusiondirectory.po            |  148 +-
 alias/locale/el_GR/fusiondirectory.po         |  148 +-
 alias/locale/es/fusiondirectory.po            |  134 +-
 alias/locale/es_CO/fusiondirectory.po         |  130 +-
 alias/locale/es_VE/fusiondirectory.po         |  134 +-
 alias/locale/fa_IR/fusiondirectory.po         |  130 +-
 alias/locale/fi_FI/fusiondirectory.po         |  130 +-
 alias/locale/fr/fusiondirectory.po            |  148 +-
 alias/locale/hu_HU/fusiondirectory.po         |  130 +-
 alias/locale/id/fusiondirectory.po            |  130 +-
 alias/locale/it_IT/fusiondirectory.po         |  148 +-
 alias/locale/lv/fusiondirectory.po            |  130 +-
 alias/locale/nb/fusiondirectory.po            |  130 +-
 alias/locale/nl/fusiondirectory.po            |  148 +-
 alias/locale/pl/fusiondirectory.po            |  134 +-
 alias/locale/pt/fusiondirectory.po            |  130 +-
 alias/locale/pt_BR/fusiondirectory.po         |  148 +-
 alias/locale/ru/fusiondirectory.po            |  148 +-
 alias/locale/ru@petr1708/fusiondirectory.po   |  130 +-
 alias/locale/sv/fusiondirectory.po            |  146 +-
 alias/locale/ug/fusiondirectory.po            |  130 +-
 alias/locale/vi_VN/fusiondirectory.po         |  130 +-
 alias/locale/zh/fusiondirectory.po            |  134 +-
 applications/locale/ar/fusiondirectory.po     |   86 +-
 applications/locale/ca/fusiondirectory.po     |   86 +-
 applications/locale/cs_CZ/fusiondirectory.po  |   86 +-
 applications/locale/de/fusiondirectory.po     |   86 +-
 applications/locale/el_GR/fusiondirectory.po  |   86 +-
 applications/locale/es/fusiondirectory.po     |   86 +-
 applications/locale/es_CO/fusiondirectory.po  |   86 +-
 applications/locale/es_VE/fusiondirectory.po  |   86 +-
 applications/locale/fa_IR/fusiondirectory.po  |   86 +-
 applications/locale/fi_FI/fusiondirectory.po  |   86 +-
 applications/locale/fr/fusiondirectory.po     |   86 +-
 applications/locale/hu_HU/fusiondirectory.po  |   86 +-
 applications/locale/id/fusiondirectory.po     |   86 +-
 applications/locale/it_IT/fusiondirectory.po  |   86 +-
 applications/locale/lv/fusiondirectory.po     |   86 +-
 applications/locale/nb/fusiondirectory.po     |   86 +-
 applications/locale/nl/fusiondirectory.po     |   86 +-
 applications/locale/pl/fusiondirectory.po     |   86 +-
 applications/locale/pt/fusiondirectory.po     |   86 +-
 applications/locale/pt_BR/fusiondirectory.po  |   86 +-
 applications/locale/ru/fusiondirectory.po     |   86 +-
 .../locale/ru@petr1708/fusiondirectory.po     |   86 +-
 applications/locale/sv/fusiondirectory.po     |   86 +-
 applications/locale/ug/fusiondirectory.po     |   86 +-
 applications/locale/vi_VN/fusiondirectory.po  |   86 +-
 applications/locale/zh/fusiondirectory.po     |   86 +-
 argonaut/locale/ar/fusiondirectory.po         |  787 ++++-----
 argonaut/locale/ca/fusiondirectory.po         |  793 ++++-----
 argonaut/locale/cs_CZ/fusiondirectory.po      |  979 +++++------
 argonaut/locale/de/fusiondirectory.po         |  969 +++++------
 argonaut/locale/el_GR/fusiondirectory.po      |  953 +++++------
 argonaut/locale/es/fusiondirectory.po         |  887 +++++-----
 argonaut/locale/es_CO/fusiondirectory.po      |  791 ++++-----
 argonaut/locale/es_VE/fusiondirectory.po      |  917 +++++------
 argonaut/locale/fa_IR/fusiondirectory.po      |  783 ++++-----
 argonaut/locale/fi_FI/fusiondirectory.po      |  757 ++++-----
 argonaut/locale/fr/fusiondirectory.po         |  983 ++++++------
 argonaut/locale/hu_HU/fusiondirectory.po      |  785 ++++-----
 argonaut/locale/id/fusiondirectory.po         |  785 ++++-----
 argonaut/locale/it_IT/fusiondirectory.po      |  977 +++++------
 argonaut/locale/lv/fusiondirectory.po         |  783 ++++-----
 argonaut/locale/nb/fusiondirectory.po         |  783 ++++-----
 argonaut/locale/nl/fusiondirectory.po         |  905 +++++------
 argonaut/locale/pl/fusiondirectory.po         |  813 +++++-----
 argonaut/locale/pt/fusiondirectory.po         |  789 ++++-----
 argonaut/locale/pt_BR/fusiondirectory.po      |  957 +++++------
 argonaut/locale/ru/fusiondirectory.po         |  823 +++++-----
 .../locale/ru@petr1708/fusiondirectory.po     |  785 ++++-----
 argonaut/locale/sv/fusiondirectory.po         |  811 +++++-----
 argonaut/locale/ug/fusiondirectory.po         |  785 ++++-----
 argonaut/locale/vi_VN/fusiondirectory.po      |  797 ++++-----
 argonaut/locale/zh/fusiondirectory.po         |  813 +++++-----
 audit/locale/ar/fusiondirectory.po            |   76 +-
 audit/locale/ca/fusiondirectory.po            |   76 +-
 audit/locale/cs_CZ/fusiondirectory.po         |   76 +-
 audit/locale/de/fusiondirectory.po            |   76 +-
 audit/locale/el_GR/fusiondirectory.po         |   76 +-
 audit/locale/es/fusiondirectory.po            |   76 +-
 audit/locale/es_CO/fusiondirectory.po         |   76 +-
 audit/locale/es_VE/fusiondirectory.po         |   76 +-
 audit/locale/fa_IR/fusiondirectory.po         |   76 +-
 audit/locale/fi_FI/fusiondirectory.po         |   76 +-
 audit/locale/fr/fusiondirectory.po            |   76 +-
 audit/locale/hu_HU/fusiondirectory.po         |   76 +-
 audit/locale/id/fusiondirectory.po            |   76 +-
 audit/locale/it_IT/fusiondirectory.po         |   76 +-
 audit/locale/lv/fusiondirectory.po            |   76 +-
 audit/locale/nb/fusiondirectory.po            |   76 +-
 audit/locale/nl/fusiondirectory.po            |   76 +-
 audit/locale/pl/fusiondirectory.po            |   76 +-
 audit/locale/pt/fusiondirectory.po            |   76 +-
 audit/locale/pt_BR/fusiondirectory.po         |   76 +-
 audit/locale/ru/fusiondirectory.po            |   76 +-
 audit/locale/ru@petr1708/fusiondirectory.po   |   76 +-
 audit/locale/sv/fusiondirectory.po            |   76 +-
 audit/locale/ug/fusiondirectory.po            |   76 +-
 audit/locale/vi_VN/fusiondirectory.po         |   76 +-
 audit/locale/zh/fusiondirectory.po            |   76 +-
 autofs/locale/ar/fusiondirectory.po           |   50 +-
 autofs/locale/ca/fusiondirectory.po           |   50 +-
 autofs/locale/cs_CZ/fusiondirectory.po        |   54 +-
 autofs/locale/de/fusiondirectory.po           |   54 +-
 autofs/locale/el_GR/fusiondirectory.po        |   54 +-
 autofs/locale/es/fusiondirectory.po           |   50 +-
 autofs/locale/es_CO/fusiondirectory.po        |   50 +-
 autofs/locale/es_VE/fusiondirectory.po        |   50 +-
 autofs/locale/fa_IR/fusiondirectory.po        |   50 +-
 autofs/locale/fi_FI/fusiondirectory.po        |   50 +-
 autofs/locale/fr/fusiondirectory.po           |   54 +-
 autofs/locale/hu_HU/fusiondirectory.po        |   50 +-
 autofs/locale/id/fusiondirectory.po           |   50 +-
 autofs/locale/it_IT/fusiondirectory.po        |   54 +-
 autofs/locale/lv/fusiondirectory.po           |   50 +-
 autofs/locale/nb/fusiondirectory.po           |   50 +-
 autofs/locale/nl/fusiondirectory.po           |   50 +-
 autofs/locale/pl/fusiondirectory.po           |   50 +-
 autofs/locale/pt/fusiondirectory.po           |   50 +-
 autofs/locale/pt_BR/fusiondirectory.po        |   54 +-
 autofs/locale/ru/fusiondirectory.po           |   52 +-
 autofs/locale/ru@petr1708/fusiondirectory.po  |   50 +-
 autofs/locale/sv/fusiondirectory.po           |   54 +-
 autofs/locale/ug/fusiondirectory.po           |   50 +-
 autofs/locale/vi_VN/fusiondirectory.po        |   50 +-
 autofs/locale/zh/fusiondirectory.po           |   50 +-
 certificates/locale/ar/fusiondirectory.po     |    2 +-
 certificates/locale/ca/fusiondirectory.po     |    2 +-
 certificates/locale/cs_CZ/fusiondirectory.po  |    2 +-
 certificates/locale/de/fusiondirectory.po     |    2 +-
 certificates/locale/el_GR/fusiondirectory.po  |    2 +-
 certificates/locale/es/fusiondirectory.po     |    2 +-
 certificates/locale/es_CO/fusiondirectory.po  |    2 +-
 certificates/locale/es_VE/fusiondirectory.po  |    2 +-
 certificates/locale/fa_IR/fusiondirectory.po  |    2 +-
 certificates/locale/fi_FI/fusiondirectory.po  |    2 +-
 certificates/locale/fr/fusiondirectory.po     |    2 +-
 certificates/locale/hu_HU/fusiondirectory.po  |    2 +-
 certificates/locale/id/fusiondirectory.po     |    2 +-
 certificates/locale/it_IT/fusiondirectory.po  |    2 +-
 certificates/locale/lv/fusiondirectory.po     |    2 +-
 certificates/locale/nb/fusiondirectory.po     |    2 +-
 certificates/locale/nl/fusiondirectory.po     |    2 +-
 certificates/locale/pl/fusiondirectory.po     |    2 +-
 certificates/locale/pt/fusiondirectory.po     |    2 +-
 certificates/locale/pt_BR/fusiondirectory.po  |    2 +-
 certificates/locale/ru/fusiondirectory.po     |    2 +-
 .../locale/ru@petr1708/fusiondirectory.po     |    2 +-
 certificates/locale/sv/fusiondirectory.po     |    2 +-
 certificates/locale/ug/fusiondirectory.po     |    2 +-
 certificates/locale/vi_VN/fusiondirectory.po  |    2 +-
 certificates/locale/zh/fusiondirectory.po     |    2 +-
 community/locale/ar/fusiondirectory.po        |   42 +-
 community/locale/ca/fusiondirectory.po        |   42 +-
 community/locale/cs_CZ/fusiondirectory.po     |   42 +-
 community/locale/de/fusiondirectory.po        |   42 +-
 community/locale/el_GR/fusiondirectory.po     |   42 +-
 community/locale/es/fusiondirectory.po        |   42 +-
 community/locale/es_CO/fusiondirectory.po     |   42 +-
 community/locale/es_VE/fusiondirectory.po     |   42 +-
 community/locale/fa_IR/fusiondirectory.po     |   42 +-
 community/locale/fi_FI/fusiondirectory.po     |   42 +-
 community/locale/fr/fusiondirectory.po        |   42 +-
 community/locale/hu_HU/fusiondirectory.po     |   42 +-
 community/locale/id/fusiondirectory.po        |   42 +-
 community/locale/it_IT/fusiondirectory.po     |   42 +-
 community/locale/lv/fusiondirectory.po        |   42 +-
 community/locale/nb/fusiondirectory.po        |   42 +-
 community/locale/nl/fusiondirectory.po        |   42 +-
 community/locale/pl/fusiondirectory.po        |   42 +-
 community/locale/pt/fusiondirectory.po        |   42 +-
 community/locale/pt_BR/fusiondirectory.po     |   42 +-
 community/locale/ru/fusiondirectory.po        |   42 +-
 .../locale/ru@petr1708/fusiondirectory.po     |   42 +-
 community/locale/sv/fusiondirectory.po        |   42 +-
 community/locale/ug/fusiondirectory.po        |   42 +-
 community/locale/vi_VN/fusiondirectory.po     |   42 +-
 community/locale/zh/fusiondirectory.po        |   42 +-
 cyrus/locale/ar/fusiondirectory.po            |   98 +-
 cyrus/locale/ca/fusiondirectory.po            |   98 +-
 cyrus/locale/cs_CZ/fusiondirectory.po         |   98 +-
 cyrus/locale/de/fusiondirectory.po            |   98 +-
 cyrus/locale/el_GR/fusiondirectory.po         |   98 +-
 cyrus/locale/es/fusiondirectory.po            |   98 +-
 cyrus/locale/es_CO/fusiondirectory.po         |   98 +-
 cyrus/locale/es_VE/fusiondirectory.po         |   98 +-
 cyrus/locale/fa_IR/fusiondirectory.po         |   98 +-
 cyrus/locale/fi_FI/fusiondirectory.po         |   98 +-
 cyrus/locale/fr/fusiondirectory.po            |   98 +-
 cyrus/locale/hu_HU/fusiondirectory.po         |   98 +-
 cyrus/locale/id/fusiondirectory.po            |   98 +-
 cyrus/locale/it_IT/fusiondirectory.po         |   98 +-
 cyrus/locale/lv/fusiondirectory.po            |   98 +-
 cyrus/locale/nb/fusiondirectory.po            |   98 +-
 cyrus/locale/nl/fusiondirectory.po            |   98 +-
 cyrus/locale/pl/fusiondirectory.po            |   98 +-
 cyrus/locale/pt/fusiondirectory.po            |   98 +-
 cyrus/locale/pt_BR/fusiondirectory.po         |   98 +-
 cyrus/locale/ru/fusiondirectory.po            |   98 +-
 cyrus/locale/ru@petr1708/fusiondirectory.po   |   98 +-
 cyrus/locale/sv/fusiondirectory.po            |   98 +-
 cyrus/locale/ug/fusiondirectory.po            |   98 +-
 cyrus/locale/vi_VN/fusiondirectory.po         |   98 +-
 cyrus/locale/zh/fusiondirectory.po            |   98 +-
 debconf/locale/ar/fusiondirectory.po          |   20 +-
 debconf/locale/ca/fusiondirectory.po          |   20 +-
 debconf/locale/cs_CZ/fusiondirectory.po       |   20 +-
 debconf/locale/de/fusiondirectory.po          |   20 +-
 debconf/locale/el_GR/fusiondirectory.po       |   20 +-
 debconf/locale/es/fusiondirectory.po          |   20 +-
 debconf/locale/es_CO/fusiondirectory.po       |   20 +-
 debconf/locale/es_VE/fusiondirectory.po       |   20 +-
 debconf/locale/fa_IR/fusiondirectory.po       |   20 +-
 debconf/locale/fi_FI/fusiondirectory.po       |   20 +-
 debconf/locale/fr/fusiondirectory.po          |   20 +-
 debconf/locale/hu_HU/fusiondirectory.po       |   20 +-
 debconf/locale/id/fusiondirectory.po          |   20 +-
 debconf/locale/it_IT/fusiondirectory.po       |   20 +-
 debconf/locale/lv/fusiondirectory.po          |   20 +-
 debconf/locale/nb/fusiondirectory.po          |   20 +-
 debconf/locale/nl/fusiondirectory.po          |   20 +-
 debconf/locale/pl/fusiondirectory.po          |   20 +-
 debconf/locale/pt/fusiondirectory.po          |   20 +-
 debconf/locale/pt_BR/fusiondirectory.po       |   20 +-
 debconf/locale/ru/fusiondirectory.po          |   20 +-
 debconf/locale/ru@petr1708/fusiondirectory.po |   20 +-
 debconf/locale/sv/fusiondirectory.po          |   20 +-
 debconf/locale/ug/fusiondirectory.po          |   20 +-
 debconf/locale/vi_VN/fusiondirectory.po       |   20 +-
 debconf/locale/zh/fusiondirectory.po          |   20 +-
 developers/locale/ar/fusiondirectory.po       |   59 +-
 developers/locale/ca/fusiondirectory.po       |   57 +-
 developers/locale/cs_CZ/fusiondirectory.po    |   57 +-
 developers/locale/de/fusiondirectory.po       |   57 +-
 developers/locale/el_GR/fusiondirectory.po    |   57 +-
 developers/locale/es/fusiondirectory.po       |   57 +-
 developers/locale/es_CO/fusiondirectory.po    |   57 +-
 developers/locale/es_VE/fusiondirectory.po    |   57 +-
 developers/locale/fa_IR/fusiondirectory.po    |   59 +-
 developers/locale/fi_FI/fusiondirectory.po    |   59 +-
 developers/locale/fr/fusiondirectory.po       |   57 +-
 developers/locale/hu_HU/fusiondirectory.po    |   59 +-
 developers/locale/id/fusiondirectory.po       |   59 +-
 developers/locale/it_IT/fusiondirectory.po    |   57 +-
 developers/locale/lv/fusiondirectory.po       |   59 +-
 developers/locale/nb/fusiondirectory.po       |   57 +-
 developers/locale/nl/fusiondirectory.po       |   57 +-
 developers/locale/pl/fusiondirectory.po       |   57 +-
 developers/locale/pt/fusiondirectory.po       |   57 +-
 developers/locale/pt_BR/fusiondirectory.po    |   57 +-
 developers/locale/ru/fusiondirectory.po       |   57 +-
 .../locale/ru@petr1708/fusiondirectory.po     |   59 +-
 developers/locale/sv/fusiondirectory.po       |   57 +-
 developers/locale/ug/fusiondirectory.po       |   59 +-
 developers/locale/vi_VN/fusiondirectory.po    |   57 +-
 developers/locale/zh/fusiondirectory.po       |   57 +-
 dhcp/locale/ar/fusiondirectory.po             |  342 ++--
 dhcp/locale/ca/fusiondirectory.po             |  342 ++--
 dhcp/locale/cs_CZ/fusiondirectory.po          |  376 +++--
 dhcp/locale/de/fusiondirectory.po             |  354 ++--
 dhcp/locale/el_GR/fusiondirectory.po          |  350 ++--
 dhcp/locale/es/fusiondirectory.po             |  350 ++--
 dhcp/locale/es_CO/fusiondirectory.po          |  342 ++--
 dhcp/locale/es_VE/fusiondirectory.po          |  350 ++--
 dhcp/locale/fa_IR/fusiondirectory.po          |  342 ++--
 dhcp/locale/fi_FI/fusiondirectory.po          |  342 ++--
 dhcp/locale/fr/fusiondirectory.po             |  395 +++--
 dhcp/locale/hu_HU/fusiondirectory.po          |  342 ++--
 dhcp/locale/id/fusiondirectory.po             |  341 ++--
 dhcp/locale/it_IT/fusiondirectory.po          |  414 +++--
 dhcp/locale/lv/fusiondirectory.po             |  342 ++--
 dhcp/locale/nb/fusiondirectory.po             |  342 ++--
 dhcp/locale/nl/fusiondirectory.po             |  350 ++--
 dhcp/locale/pl/fusiondirectory.po             |  344 ++--
 dhcp/locale/pt/fusiondirectory.po             |  342 ++--
 dhcp/locale/pt_BR/fusiondirectory.po          |  350 ++--
 dhcp/locale/ru/fusiondirectory.po             |  351 ++--
 dhcp/locale/ru@petr1708/fusiondirectory.po    |  341 ++--
 dhcp/locale/sv/fusiondirectory.po             |  346 ++--
 dhcp/locale/ug/fusiondirectory.po             |  341 ++--
 dhcp/locale/vi_VN/fusiondirectory.po          |  342 ++--
 dhcp/locale/zh/fusiondirectory.po             |  344 ++--
 dns/locale/ar/fusiondirectory.po              |  184 +--
 dns/locale/ca/fusiondirectory.po              |  182 +--
 dns/locale/cs_CZ/fusiondirectory.po           |  204 +--
 dns/locale/de/fusiondirectory.po              |  204 +--
 dns/locale/el_GR/fusiondirectory.po           |  200 +--
 dns/locale/es/fusiondirectory.po              |  188 +--
 dns/locale/es_CO/fusiondirectory.po           |  182 +--
 dns/locale/es_VE/fusiondirectory.po           |  188 +--
 dns/locale/fa_IR/fusiondirectory.po           |  182 +--
 dns/locale/fi_FI/fusiondirectory.po           |  182 +--
 dns/locale/fr/fusiondirectory.po              |  226 +--
 dns/locale/hu_HU/fusiondirectory.po           |  182 +--
 dns/locale/id/fusiondirectory.po              |  182 +--
 dns/locale/it_IT/fusiondirectory.po           |  226 +--
 dns/locale/lv/fusiondirectory.po              |  182 +--
 dns/locale/nb/fusiondirectory.po              |  182 +--
 dns/locale/nl/fusiondirectory.po              |  188 +--
 dns/locale/pl/fusiondirectory.po              |  184 +--
 dns/locale/pt/fusiondirectory.po              |  184 +--
 dns/locale/pt_BR/fusiondirectory.po           |  188 +--
 dns/locale/ru/fusiondirectory.po              |  220 +--
 dns/locale/ru@petr1708/fusiondirectory.po     |  182 +--
 dns/locale/sv/fusiondirectory.po              |  184 +--
 dns/locale/ug/fusiondirectory.po              |  182 +--
 dns/locale/vi_VN/fusiondirectory.po           |  184 +--
 dns/locale/zh/fusiondirectory.po              |  184 +--
 dovecot/locale/ar/fusiondirectory.po          |   28 +-
 dovecot/locale/ca/fusiondirectory.po          |   28 +-
 dovecot/locale/cs_CZ/fusiondirectory.po       |   28 +-
 dovecot/locale/de/fusiondirectory.po          |   28 +-
 dovecot/locale/el_GR/fusiondirectory.po       |   28 +-
 dovecot/locale/es/fusiondirectory.po          |   28 +-
 dovecot/locale/es_CO/fusiondirectory.po       |   28 +-
 dovecot/locale/es_VE/fusiondirectory.po       |   28 +-
 dovecot/locale/fa_IR/fusiondirectory.po       |   28 +-
 dovecot/locale/fi_FI/fusiondirectory.po       |   28 +-
 dovecot/locale/fr/fusiondirectory.po          |   28 +-
 dovecot/locale/hu_HU/fusiondirectory.po       |   28 +-
 dovecot/locale/id/fusiondirectory.po          |   28 +-
 dovecot/locale/it_IT/fusiondirectory.po       |   28 +-
 dovecot/locale/lv/fusiondirectory.po          |   28 +-
 dovecot/locale/nb/fusiondirectory.po          |   28 +-
 dovecot/locale/nl/fusiondirectory.po          |   28 +-
 dovecot/locale/pl/fusiondirectory.po          |   28 +-
 dovecot/locale/pt/fusiondirectory.po          |   28 +-
 dovecot/locale/pt_BR/fusiondirectory.po       |   28 +-
 dovecot/locale/ru/fusiondirectory.po          |   28 +-
 dovecot/locale/ru@petr1708/fusiondirectory.po |   28 +-
 dovecot/locale/sv/fusiondirectory.po          |   28 +-
 dovecot/locale/ug/fusiondirectory.po          |   28 +-
 dovecot/locale/vi_VN/fusiondirectory.po       |   28 +-
 dovecot/locale/zh/fusiondirectory.po          |   28 +-
 dsa/locale/ar/fusiondirectory.po              |   52 +-
 dsa/locale/ca/fusiondirectory.po              |   52 +-
 dsa/locale/cs_CZ/fusiondirectory.po           |   52 +-
 dsa/locale/de/fusiondirectory.po              |   52 +-
 dsa/locale/el_GR/fusiondirectory.po           |   52 +-
 dsa/locale/es/fusiondirectory.po              |   52 +-
 dsa/locale/es_CO/fusiondirectory.po           |   52 +-
 dsa/locale/es_VE/fusiondirectory.po           |   52 +-
 dsa/locale/fa_IR/fusiondirectory.po           |   52 +-
 dsa/locale/fi_FI/fusiondirectory.po           |   52 +-
 dsa/locale/fr/fusiondirectory.po              |   52 +-
 dsa/locale/hu_HU/fusiondirectory.po           |   52 +-
 dsa/locale/id/fusiondirectory.po              |   52 +-
 dsa/locale/it_IT/fusiondirectory.po           |   52 +-
 dsa/locale/lv/fusiondirectory.po              |   52 +-
 dsa/locale/nb/fusiondirectory.po              |   52 +-
 dsa/locale/nl/fusiondirectory.po              |   52 +-
 dsa/locale/pl/fusiondirectory.po              |   52 +-
 dsa/locale/pt/fusiondirectory.po              |   52 +-
 dsa/locale/pt_BR/fusiondirectory.po           |   52 +-
 dsa/locale/ru/fusiondirectory.po              |   52 +-
 dsa/locale/ru@petr1708/fusiondirectory.po     |   52 +-
 dsa/locale/sv/fusiondirectory.po              |   52 +-
 dsa/locale/ug/fusiondirectory.po              |   52 +-
 dsa/locale/vi_VN/fusiondirectory.po           |   52 +-
 dsa/locale/zh/fusiondirectory.po              |   52 +-
 ejbca/locale/ar/fusiondirectory.po            |   42 +-
 ejbca/locale/ca/fusiondirectory.po            |   42 +-
 ejbca/locale/cs_CZ/fusiondirectory.po         |   42 +-
 ejbca/locale/de/fusiondirectory.po            |   42 +-
 ejbca/locale/el_GR/fusiondirectory.po         |   42 +-
 ejbca/locale/es/fusiondirectory.po            |   42 +-
 ejbca/locale/es_CO/fusiondirectory.po         |   42 +-
 ejbca/locale/es_VE/fusiondirectory.po         |   42 +-
 ejbca/locale/fa_IR/fusiondirectory.po         |   42 +-
 ejbca/locale/fi_FI/fusiondirectory.po         |   42 +-
 ejbca/locale/fr/fusiondirectory.po            |   42 +-
 ejbca/locale/hu_HU/fusiondirectory.po         |   42 +-
 ejbca/locale/id/fusiondirectory.po            |   42 +-
 ejbca/locale/it_IT/fusiondirectory.po         |   42 +-
 ejbca/locale/lv/fusiondirectory.po            |   42 +-
 ejbca/locale/nb/fusiondirectory.po            |   42 +-
 ejbca/locale/nl/fusiondirectory.po            |   42 +-
 ejbca/locale/pl/fusiondirectory.po            |   42 +-
 ejbca/locale/pt/fusiondirectory.po            |   42 +-
 ejbca/locale/pt_BR/fusiondirectory.po         |   42 +-
 ejbca/locale/ru/fusiondirectory.po            |   42 +-
 ejbca/locale/ru@petr1708/fusiondirectory.po   |   42 +-
 ejbca/locale/sv/fusiondirectory.po            |   42 +-
 ejbca/locale/ug/fusiondirectory.po            |   42 +-
 ejbca/locale/vi_VN/fusiondirectory.po         |   42 +-
 ejbca/locale/zh/fusiondirectory.po            |   42 +-
 fai/locale/ar/fusiondirectory.po              |  861 +++++-----
 fai/locale/ca/fusiondirectory.po              |  859 +++++-----
 fai/locale/cs_CZ/fusiondirectory.po           | 1137 +++++++------
 fai/locale/de/fusiondirectory.po              | 1131 +++++++------
 fai/locale/el_GR/fusiondirectory.po           | 1121 +++++++------
 fai/locale/es/fusiondirectory.po              | 1017 ++++++------
 fai/locale/es_CO/fusiondirectory.po           | 1059 ++++++------
 fai/locale/es_VE/fusiondirectory.po           | 1017 ++++++------
 fai/locale/fa_IR/fusiondirectory.po           |  855 +++++-----
 fai/locale/fi_FI/fusiondirectory.po           |  897 ++++++-----
 fai/locale/fr/fusiondirectory.po              | 1131 +++++++------
 fai/locale/hu_HU/fusiondirectory.po           |  855 +++++-----
 fai/locale/id/fusiondirectory.po              |  851 +++++-----
 fai/locale/it_IT/fusiondirectory.po           | 1131 +++++++------
 fai/locale/lv/fusiondirectory.po              | 1057 ++++++------
 fai/locale/nb/fusiondirectory.po              | 1053 ++++++------
 fai/locale/nl/fusiondirectory.po              | 1035 ++++++------
 fai/locale/pl/fusiondirectory.po              | 1153 +++++++------
 fai/locale/pt/fusiondirectory.po              |  897 ++++++-----
 fai/locale/pt_BR/fusiondirectory.po           | 1153 +++++++------
 fai/locale/ru/fusiondirectory.po              | 1105 +++++++------
 fai/locale/ru@petr1708/fusiondirectory.po     |  851 +++++-----
 fai/locale/sv/fusiondirectory.po              | 1035 ++++++------
 fai/locale/ug/fusiondirectory.po              |  851 +++++-----
 fai/locale/vi_VN/fusiondirectory.po           |  897 ++++++-----
 fai/locale/zh/fusiondirectory.po              | 1111 +++++++------
 freeradius/locale/ar/fusiondirectory.po       |   20 +-
 freeradius/locale/ca/fusiondirectory.po       |   20 +-
 freeradius/locale/cs_CZ/fusiondirectory.po    |   20 +-
 freeradius/locale/de/fusiondirectory.po       |   20 +-
 freeradius/locale/el_GR/fusiondirectory.po    |   20 +-
 freeradius/locale/es/fusiondirectory.po       |   20 +-
 freeradius/locale/es_CO/fusiondirectory.po    |   20 +-
 freeradius/locale/es_VE/fusiondirectory.po    |   20 +-
 freeradius/locale/fa_IR/fusiondirectory.po    |   20 +-
 freeradius/locale/fi_FI/fusiondirectory.po    |   20 +-
 freeradius/locale/fr/fusiondirectory.po       |   20 +-
 freeradius/locale/hu_HU/fusiondirectory.po    |   20 +-
 freeradius/locale/id/fusiondirectory.po       |   20 +-
 freeradius/locale/it_IT/fusiondirectory.po    |   20 +-
 freeradius/locale/lv/fusiondirectory.po       |   20 +-
 freeradius/locale/nb/fusiondirectory.po       |   20 +-
 freeradius/locale/nl/fusiondirectory.po       |   20 +-
 freeradius/locale/pl/fusiondirectory.po       |   20 +-
 freeradius/locale/pt/fusiondirectory.po       |   20 +-
 freeradius/locale/pt_BR/fusiondirectory.po    |   20 +-
 freeradius/locale/ru/fusiondirectory.po       |   20 +-
 .../locale/ru@petr1708/fusiondirectory.po     |   20 +-
 freeradius/locale/sv/fusiondirectory.po       |   20 +-
 freeradius/locale/ug/fusiondirectory.po       |   20 +-
 freeradius/locale/vi_VN/fusiondirectory.po    |   20 +-
 freeradius/locale/zh/fusiondirectory.po       |   20 +-
 fusioninventory/locale/ar/fusiondirectory.po  |  132 +-
 fusioninventory/locale/ca/fusiondirectory.po  |  132 +-
 .../locale/cs_CZ/fusiondirectory.po           |  146 +-
 fusioninventory/locale/de/fusiondirectory.po  |  144 +-
 .../locale/el_GR/fusiondirectory.po           |  146 +-
 fusioninventory/locale/es/fusiondirectory.po  |  138 +-
 .../locale/es_CO/fusiondirectory.po           |  134 +-
 .../locale/es_VE/fusiondirectory.po           |  138 +-
 .../locale/fa_IR/fusiondirectory.po           |  132 +-
 .../locale/fi_FI/fusiondirectory.po           |  132 +-
 fusioninventory/locale/fr/fusiondirectory.po  |  146 +-
 .../locale/hu_HU/fusiondirectory.po           |  134 +-
 fusioninventory/locale/id/fusiondirectory.po  |  132 +-
 .../locale/it_IT/fusiondirectory.po           |  146 +-
 fusioninventory/locale/lv/fusiondirectory.po  |  134 +-
 fusioninventory/locale/nb/fusiondirectory.po  |  132 +-
 fusioninventory/locale/nl/fusiondirectory.po  |  138 +-
 fusioninventory/locale/pl/fusiondirectory.po  |  134 +-
 fusioninventory/locale/pt/fusiondirectory.po  |  134 +-
 .../locale/pt_BR/fusiondirectory.po           |  146 +-
 fusioninventory/locale/ru/fusiondirectory.po  |  138 +-
 .../locale/ru@petr1708/fusiondirectory.po     |  132 +-
 fusioninventory/locale/sv/fusiondirectory.po  |  134 +-
 fusioninventory/locale/ug/fusiondirectory.po  |  132 +-
 .../locale/vi_VN/fusiondirectory.po           |  134 +-
 fusioninventory/locale/zh/fusiondirectory.po  |  134 +-
 gpg/locale/ar/fusiondirectory.po              |  124 +-
 gpg/locale/ca/fusiondirectory.po              |  128 +-
 gpg/locale/cs_CZ/fusiondirectory.po           |  160 +-
 gpg/locale/de/fusiondirectory.po              |  154 +-
 gpg/locale/el_GR/fusiondirectory.po           |  160 +-
 gpg/locale/es/fusiondirectory.po              |  132 +-
 gpg/locale/es_CO/fusiondirectory.po           |  128 +-
 gpg/locale/es_VE/fusiondirectory.po           |  132 +-
 gpg/locale/fa_IR/fusiondirectory.po           |  128 +-
 gpg/locale/fi_FI/fusiondirectory.po           |  128 +-
 gpg/locale/fr/fusiondirectory.po              |  160 +-
 gpg/locale/hu_HU/fusiondirectory.po           |  124 +-
 gpg/locale/id/fusiondirectory.po              |  124 +-
 gpg/locale/it_IT/fusiondirectory.po           |  160 +-
 gpg/locale/lv/fusiondirectory.po              |  128 +-
 gpg/locale/nb/fusiondirectory.po              |  128 +-
 gpg/locale/nl/fusiondirectory.po              |  132 +-
 gpg/locale/pl/fusiondirectory.po              |  128 +-
 gpg/locale/pt/fusiondirectory.po              |  128 +-
 gpg/locale/pt_BR/fusiondirectory.po           |  132 +-
 gpg/locale/ru/fusiondirectory.po              |  154 +-
 gpg/locale/ru@petr1708/fusiondirectory.po     |  124 +-
 gpg/locale/sv/fusiondirectory.po              |  128 +-
 gpg/locale/ug/fusiondirectory.po              |  124 +-
 gpg/locale/vi_VN/fusiondirectory.po           |  128 +-
 gpg/locale/zh/fusiondirectory.po              |  128 +-
 ipmi/locale/ar/fusiondirectory.po             |    2 +-
 ipmi/locale/ca/fusiondirectory.po             |    2 +-
 ipmi/locale/cs_CZ/fusiondirectory.po          |    2 +-
 ipmi/locale/de/fusiondirectory.po             |    2 +-
 ipmi/locale/el_GR/fusiondirectory.po          |    2 +-
 ipmi/locale/es/fusiondirectory.po             |    2 +-
 ipmi/locale/es_CO/fusiondirectory.po          |    2 +-
 ipmi/locale/es_VE/fusiondirectory.po          |    2 +-
 ipmi/locale/fa_IR/fusiondirectory.po          |    2 +-
 ipmi/locale/fi_FI/fusiondirectory.po          |    2 +-
 ipmi/locale/fr/fusiondirectory.po             |    2 +-
 ipmi/locale/hu_HU/fusiondirectory.po          |    2 +-
 ipmi/locale/id/fusiondirectory.po             |    2 +-
 ipmi/locale/it_IT/fusiondirectory.po          |    2 +-
 ipmi/locale/lv/fusiondirectory.po             |    2 +-
 ipmi/locale/nb/fusiondirectory.po             |    2 +-
 ipmi/locale/nl/fusiondirectory.po             |    2 +-
 ipmi/locale/pl/fusiondirectory.po             |    2 +-
 ipmi/locale/pt/fusiondirectory.po             |    2 +-
 ipmi/locale/pt_BR/fusiondirectory.po          |    2 +-
 ipmi/locale/ru/fusiondirectory.po             |    2 +-
 ipmi/locale/ru@petr1708/fusiondirectory.po    |    2 +-
 ipmi/locale/sv/fusiondirectory.po             |    2 +-
 ipmi/locale/ug/fusiondirectory.po             |    2 +-
 ipmi/locale/vi_VN/fusiondirectory.po          |    2 +-
 ipmi/locale/zh/fusiondirectory.po             |    2 +-
 kolab2/locale/ar/fusiondirectory.po           |  312 ++--
 kolab2/locale/ca/fusiondirectory.po           |  312 ++--
 kolab2/locale/cs_CZ/fusiondirectory.po        |  312 ++--
 kolab2/locale/de/fusiondirectory.po           |  312 ++--
 kolab2/locale/el_GR/fusiondirectory.po        |  312 ++--
 kolab2/locale/es/fusiondirectory.po           |  312 ++--
 kolab2/locale/es_CO/fusiondirectory.po        |  312 ++--
 kolab2/locale/es_VE/fusiondirectory.po        |  312 ++--
 kolab2/locale/fa_IR/fusiondirectory.po        |  312 ++--
 kolab2/locale/fi_FI/fusiondirectory.po        |  312 ++--
 kolab2/locale/fr/fusiondirectory.po           |  312 ++--
 kolab2/locale/hu_HU/fusiondirectory.po        |  312 ++--
 kolab2/locale/id/fusiondirectory.po           |  312 ++--
 kolab2/locale/it_IT/fusiondirectory.po        |  312 ++--
 kolab2/locale/lv/fusiondirectory.po           |  312 ++--
 kolab2/locale/nb/fusiondirectory.po           |  312 ++--
 kolab2/locale/nl/fusiondirectory.po           |  312 ++--
 kolab2/locale/pl/fusiondirectory.po           |  312 ++--
 kolab2/locale/pt/fusiondirectory.po           |  312 ++--
 kolab2/locale/pt_BR/fusiondirectory.po        |  312 ++--
 kolab2/locale/ru/fusiondirectory.po           |  312 ++--
 kolab2/locale/ru@petr1708/fusiondirectory.po  |  312 ++--
 kolab2/locale/sv/fusiondirectory.po           |  312 ++--
 kolab2/locale/ug/fusiondirectory.po           |  312 ++--
 kolab2/locale/vi_VN/fusiondirectory.po        |  312 ++--
 kolab2/locale/zh/fusiondirectory.po           |  312 ++--
 ldapdump/locale/ar/fusiondirectory.po         |    2 +-
 ldapdump/locale/ca/fusiondirectory.po         |    2 +-
 ldapdump/locale/cs_CZ/fusiondirectory.po      |    2 +-
 ldapdump/locale/de/fusiondirectory.po         |    2 +-
 ldapdump/locale/el_GR/fusiondirectory.po      |    2 +-
 ldapdump/locale/es/fusiondirectory.po         |    2 +-
 ldapdump/locale/es_CO/fusiondirectory.po      |    2 +-
 ldapdump/locale/es_VE/fusiondirectory.po      |    2 +-
 ldapdump/locale/fa_IR/fusiondirectory.po      |    2 +-
 ldapdump/locale/fi_FI/fusiondirectory.po      |    2 +-
 ldapdump/locale/fr/fusiondirectory.po         |    2 +-
 ldapdump/locale/hu_HU/fusiondirectory.po      |    2 +-
 ldapdump/locale/id/fusiondirectory.po         |    2 +-
 ldapdump/locale/it_IT/fusiondirectory.po      |    2 +-
 ldapdump/locale/lv/fusiondirectory.po         |    2 +-
 ldapdump/locale/nb/fusiondirectory.po         |    2 +-
 ldapdump/locale/nl/fusiondirectory.po         |    2 +-
 ldapdump/locale/pl/fusiondirectory.po         |    2 +-
 ldapdump/locale/pt/fusiondirectory.po         |    2 +-
 ldapdump/locale/pt_BR/fusiondirectory.po      |    2 +-
 ldapdump/locale/ru/fusiondirectory.po         |    2 +-
 .../locale/ru@petr1708/fusiondirectory.po     |    2 +-
 ldapdump/locale/sv/fusiondirectory.po         |    2 +-
 ldapdump/locale/ug/fusiondirectory.po         |    2 +-
 ldapdump/locale/vi_VN/fusiondirectory.po      |    2 +-
 ldapdump/locale/zh/fusiondirectory.po         |    2 +-
 ldapmanager/locale/ar/fusiondirectory.po      |  206 +--
 ldapmanager/locale/ca/fusiondirectory.po      |  210 +--
 ldapmanager/locale/cs_CZ/fusiondirectory.po   |  222 +--
 ldapmanager/locale/de/fusiondirectory.po      |  222 +--
 ldapmanager/locale/el_GR/fusiondirectory.po   |  222 +--
 ldapmanager/locale/es/fusiondirectory.po      |  222 +--
 ldapmanager/locale/es_CO/fusiondirectory.po   |  218 +--
 ldapmanager/locale/es_VE/fusiondirectory.po   |  222 +--
 ldapmanager/locale/fa_IR/fusiondirectory.po   |  210 +--
 ldapmanager/locale/fi_FI/fusiondirectory.po   |  210 +--
 ldapmanager/locale/fr/fusiondirectory.po      |  222 +--
 ldapmanager/locale/hu_HU/fusiondirectory.po   |  204 +--
 ldapmanager/locale/id/fusiondirectory.po      |  204 +--
 ldapmanager/locale/it_IT/fusiondirectory.po   |  222 +--
 ldapmanager/locale/lv/fusiondirectory.po      |  214 +--
 ldapmanager/locale/nb/fusiondirectory.po      |  214 +--
 ldapmanager/locale/nl/fusiondirectory.po      |  222 +--
 ldapmanager/locale/pl/fusiondirectory.po      |  222 +--
 ldapmanager/locale/pt/fusiondirectory.po      |  212 +--
 ldapmanager/locale/pt_BR/fusiondirectory.po   |  222 +--
 ldapmanager/locale/ru/fusiondirectory.po      |  222 +--
 .../locale/ru@petr1708/fusiondirectory.po     |  204 +--
 ldapmanager/locale/sv/fusiondirectory.po      |  218 +--
 ldapmanager/locale/ug/fusiondirectory.po      |  204 +--
 ldapmanager/locale/vi_VN/fusiondirectory.po   |  214 +--
 ldapmanager/locale/zh/fusiondirectory.po      |  222 +--
 mail/locale/ar/fusiondirectory.po             |  192 +--
 mail/locale/ca/fusiondirectory.po             |  192 +--
 mail/locale/cs_CZ/fusiondirectory.po          |  192 +--
 mail/locale/de/fusiondirectory.po             |  192 +--
 mail/locale/el_GR/fusiondirectory.po          |  192 +--
 mail/locale/es/fusiondirectory.po             |  192 +--
 mail/locale/es_CO/fusiondirectory.po          |  192 +--
 mail/locale/es_VE/fusiondirectory.po          |  192 +--
 mail/locale/fa_IR/fusiondirectory.po          |  192 +--
 mail/locale/fi_FI/fusiondirectory.po          |  192 +--
 mail/locale/fr/fusiondirectory.po             |  192 +--
 mail/locale/hu_HU/fusiondirectory.po          |  192 +--
 mail/locale/id/fusiondirectory.po             |  192 +--
 mail/locale/it_IT/fusiondirectory.po          |  192 +--
 mail/locale/lv/fusiondirectory.po             |  192 +--
 mail/locale/nb/fusiondirectory.po             |  192 +--
 mail/locale/nl/fusiondirectory.po             |  192 +--
 mail/locale/pl/fusiondirectory.po             |  192 +--
 mail/locale/pt/fusiondirectory.po             |  192 +--
 mail/locale/pt_BR/fusiondirectory.po          |  192 +--
 mail/locale/ru/fusiondirectory.po             |  192 +--
 mail/locale/ru@petr1708/fusiondirectory.po    |  192 +--
 mail/locale/sv/fusiondirectory.po             |  192 +--
 mail/locale/ug/fusiondirectory.po             |  192 +--
 mail/locale/vi_VN/fusiondirectory.po          |  192 +--
 mail/locale/zh/fusiondirectory.po             |  192 +--
 mixedgroups/locale/ar/fusiondirectory.po      |    2 +-
 mixedgroups/locale/ca/fusiondirectory.po      |    2 +-
 mixedgroups/locale/cs_CZ/fusiondirectory.po   |    2 +-
 mixedgroups/locale/de/fusiondirectory.po      |    2 +-
 mixedgroups/locale/el_GR/fusiondirectory.po   |    2 +-
 mixedgroups/locale/es/fusiondirectory.po      |    2 +-
 mixedgroups/locale/es_CO/fusiondirectory.po   |    2 +-
 mixedgroups/locale/es_VE/fusiondirectory.po   |    2 +-
 mixedgroups/locale/fa_IR/fusiondirectory.po   |    2 +-
 mixedgroups/locale/fi_FI/fusiondirectory.po   |    2 +-
 mixedgroups/locale/fr/fusiondirectory.po      |    2 +-
 mixedgroups/locale/hu_HU/fusiondirectory.po   |    2 +-
 mixedgroups/locale/id/fusiondirectory.po      |    2 +-
 mixedgroups/locale/it_IT/fusiondirectory.po   |    2 +-
 mixedgroups/locale/lv/fusiondirectory.po      |    2 +-
 mixedgroups/locale/nb/fusiondirectory.po      |    2 +-
 mixedgroups/locale/nl/fusiondirectory.po      |    2 +-
 mixedgroups/locale/pl/fusiondirectory.po      |    2 +-
 mixedgroups/locale/pt/fusiondirectory.po      |    2 +-
 mixedgroups/locale/pt_BR/fusiondirectory.po   |    2 +-
 mixedgroups/locale/ru/fusiondirectory.po      |    2 +-
 .../locale/ru@petr1708/fusiondirectory.po     |    2 +-
 mixedgroups/locale/sv/fusiondirectory.po      |    2 +-
 mixedgroups/locale/ug/fusiondirectory.po      |    2 +-
 mixedgroups/locale/vi_VN/fusiondirectory.po   |    2 +-
 mixedgroups/locale/zh/fusiondirectory.po      |    2 +-
 nagios/locale/ar/fusiondirectory.po           |    2 +-
 nagios/locale/ca/fusiondirectory.po           |    2 +-
 nagios/locale/cs_CZ/fusiondirectory.po        |    2 +-
 nagios/locale/de/fusiondirectory.po           |    2 +-
 nagios/locale/el_GR/fusiondirectory.po        |    2 +-
 nagios/locale/es/fusiondirectory.po           |    2 +-
 nagios/locale/es_CO/fusiondirectory.po        |    2 +-
 nagios/locale/es_VE/fusiondirectory.po        |    2 +-
 nagios/locale/fa_IR/fusiondirectory.po        |    2 +-
 nagios/locale/fi_FI/fusiondirectory.po        |    2 +-
 nagios/locale/fr/fusiondirectory.po           |    2 +-
 nagios/locale/hu_HU/fusiondirectory.po        |    2 +-
 nagios/locale/id/fusiondirectory.po           |    2 +-
 nagios/locale/it_IT/fusiondirectory.po        |    2 +-
 nagios/locale/lv/fusiondirectory.po           |    2 +-
 nagios/locale/nb/fusiondirectory.po           |    2 +-
 nagios/locale/nl/fusiondirectory.po           |    2 +-
 nagios/locale/pl/fusiondirectory.po           |    2 +-
 nagios/locale/pt/fusiondirectory.po           |    2 +-
 nagios/locale/pt_BR/fusiondirectory.po        |    2 +-
 nagios/locale/ru/fusiondirectory.po           |    2 +-
 nagios/locale/ru@petr1708/fusiondirectory.po  |    2 +-
 nagios/locale/sv/fusiondirectory.po           |    2 +-
 nagios/locale/ug/fusiondirectory.po           |    2 +-
 nagios/locale/vi_VN/fusiondirectory.po        |    2 +-
 nagios/locale/zh/fusiondirectory.po           |    2 +-
 netgroups/locale/ar/fusiondirectory.po        |   74 +-
 netgroups/locale/ca/fusiondirectory.po        |   74 +-
 netgroups/locale/cs_CZ/fusiondirectory.po     |   74 +-
 netgroups/locale/de/fusiondirectory.po        |   74 +-
 netgroups/locale/el_GR/fusiondirectory.po     |   74 +-
 netgroups/locale/es/fusiondirectory.po        |   74 +-
 netgroups/locale/es_CO/fusiondirectory.po     |   74 +-
 netgroups/locale/es_VE/fusiondirectory.po     |   74 +-
 netgroups/locale/fa_IR/fusiondirectory.po     |   74 +-
 netgroups/locale/fi_FI/fusiondirectory.po     |   74 +-
 netgroups/locale/fr/fusiondirectory.po        |   74 +-
 netgroups/locale/hu_HU/fusiondirectory.po     |   74 +-
 netgroups/locale/id/fusiondirectory.po        |   74 +-
 netgroups/locale/it_IT/fusiondirectory.po     |   74 +-
 netgroups/locale/lv/fusiondirectory.po        |   74 +-
 netgroups/locale/nb/fusiondirectory.po        |   74 +-
 netgroups/locale/nl/fusiondirectory.po        |   74 +-
 netgroups/locale/pl/fusiondirectory.po        |   74 +-
 netgroups/locale/pt/fusiondirectory.po        |   74 +-
 netgroups/locale/pt_BR/fusiondirectory.po     |   74 +-
 netgroups/locale/ru/fusiondirectory.po        |   74 +-
 .../locale/ru@petr1708/fusiondirectory.po     |   74 +-
 netgroups/locale/sv/fusiondirectory.po        |   74 +-
 netgroups/locale/ug/fusiondirectory.po        |   74 +-
 netgroups/locale/vi_VN/fusiondirectory.po     |   74 +-
 netgroups/locale/zh/fusiondirectory.po        |   74 +-
 newsletter/locale/ar/fusiondirectory.po       |    2 +-
 newsletter/locale/ca/fusiondirectory.po       |    2 +-
 newsletter/locale/cs_CZ/fusiondirectory.po    |    2 +-
 newsletter/locale/de/fusiondirectory.po       |    2 +-
 newsletter/locale/el_GR/fusiondirectory.po    |    2 +-
 newsletter/locale/es/fusiondirectory.po       |    2 +-
 newsletter/locale/es_CO/fusiondirectory.po    |    2 +-
 newsletter/locale/es_VE/fusiondirectory.po    |    2 +-
 newsletter/locale/fa_IR/fusiondirectory.po    |    2 +-
 newsletter/locale/fi_FI/fusiondirectory.po    |    2 +-
 newsletter/locale/fr/fusiondirectory.po       |    2 +-
 newsletter/locale/hu_HU/fusiondirectory.po    |    2 +-
 newsletter/locale/id/fusiondirectory.po       |    2 +-
 newsletter/locale/it_IT/fusiondirectory.po    |    2 +-
 newsletter/locale/lv/fusiondirectory.po       |    2 +-
 newsletter/locale/nb/fusiondirectory.po       |    2 +-
 newsletter/locale/nl/fusiondirectory.po       |    2 +-
 newsletter/locale/pl/fusiondirectory.po       |    2 +-
 newsletter/locale/pt/fusiondirectory.po       |    2 +-
 newsletter/locale/pt_BR/fusiondirectory.po    |    2 +-
 newsletter/locale/ru/fusiondirectory.po       |    2 +-
 .../locale/ru@petr1708/fusiondirectory.po     |    2 +-
 newsletter/locale/sv/fusiondirectory.po       |    2 +-
 newsletter/locale/ug/fusiondirectory.po       |    2 +-
 newsletter/locale/vi_VN/fusiondirectory.po    |    2 +-
 newsletter/locale/zh/fusiondirectory.po       |    2 +-
 opsi/locale/ar/fusiondirectory.po             |  121 +-
 opsi/locale/ca/fusiondirectory.po             |  121 +-
 opsi/locale/cs_CZ/fusiondirectory.po          |  121 +-
 opsi/locale/de/fusiondirectory.po             |  121 +-
 opsi/locale/el_GR/fusiondirectory.po          |  121 +-
 opsi/locale/es/fusiondirectory.po             |  121 +-
 opsi/locale/es_CO/fusiondirectory.po          |  121 +-
 opsi/locale/es_VE/fusiondirectory.po          |  121 +-
 opsi/locale/fa_IR/fusiondirectory.po          |  121 +-
 opsi/locale/fi_FI/fusiondirectory.po          |  121 +-
 opsi/locale/fr/fusiondirectory.po             |  121 +-
 opsi/locale/hu_HU/fusiondirectory.po          |  121 +-
 opsi/locale/id/fusiondirectory.po             |  121 +-
 opsi/locale/it_IT/fusiondirectory.po          |  121 +-
 opsi/locale/lv/fusiondirectory.po             |  121 +-
 opsi/locale/nb/fusiondirectory.po             |  121 +-
 opsi/locale/nl/fusiondirectory.po             |  121 +-
 opsi/locale/pl/fusiondirectory.po             |  121 +-
 opsi/locale/pt/fusiondirectory.po             |  121 +-
 opsi/locale/pt_BR/fusiondirectory.po          |  121 +-
 opsi/locale/ru/fusiondirectory.po             |  121 +-
 opsi/locale/ru@petr1708/fusiondirectory.po    |  121 +-
 opsi/locale/sv/fusiondirectory.po             |  121 +-
 opsi/locale/ug/fusiondirectory.po             |  121 +-
 opsi/locale/vi_VN/fusiondirectory.po          |  121 +-
 opsi/locale/zh/fusiondirectory.po             |  121 +-
 personal/locale/ar/fusiondirectory.po         |    2 +-
 personal/locale/ca/fusiondirectory.po         |    2 +-
 personal/locale/cs_CZ/fusiondirectory.po      |    2 +-
 personal/locale/de/fusiondirectory.po         |    2 +-
 personal/locale/el_GR/fusiondirectory.po      |    2 +-
 personal/locale/es/fusiondirectory.po         |    2 +-
 personal/locale/es_CO/fusiondirectory.po      |    2 +-
 personal/locale/es_VE/fusiondirectory.po      |    2 +-
 personal/locale/fa_IR/fusiondirectory.po      |    2 +-
 personal/locale/fi_FI/fusiondirectory.po      |    2 +-
 personal/locale/fr/fusiondirectory.po         |    2 +-
 personal/locale/hu_HU/fusiondirectory.po      |    2 +-
 personal/locale/id/fusiondirectory.po         |    2 +-
 personal/locale/it_IT/fusiondirectory.po      |    2 +-
 personal/locale/lv/fusiondirectory.po         |    2 +-
 personal/locale/nb/fusiondirectory.po         |    2 +-
 personal/locale/nl/fusiondirectory.po         |    2 +-
 personal/locale/pl/fusiondirectory.po         |    2 +-
 personal/locale/pt/fusiondirectory.po         |    2 +-
 personal/locale/pt_BR/fusiondirectory.po      |    2 +-
 personal/locale/ru/fusiondirectory.po         |    2 +-
 .../locale/ru@petr1708/fusiondirectory.po     |    2 +-
 personal/locale/sv/fusiondirectory.po         |    2 +-
 personal/locale/ug/fusiondirectory.po         |    2 +-
 personal/locale/vi_VN/fusiondirectory.po      |    2 +-
 personal/locale/zh/fusiondirectory.po         |    2 +-
 postfix/locale/ar/fusiondirectory.po          |    2 +-
 postfix/locale/ca/fusiondirectory.po          |    2 +-
 postfix/locale/cs_CZ/fusiondirectory.po       |    2 +-
 postfix/locale/de/fusiondirectory.po          |    2 +-
 postfix/locale/el_GR/fusiondirectory.po       |    2 +-
 postfix/locale/es/fusiondirectory.po          |    2 +-
 postfix/locale/es_CO/fusiondirectory.po       |    2 +-
 postfix/locale/es_VE/fusiondirectory.po       |    2 +-
 postfix/locale/fa_IR/fusiondirectory.po       |    2 +-
 postfix/locale/fi_FI/fusiondirectory.po       |    2 +-
 postfix/locale/fr/fusiondirectory.po          |    2 +-
 postfix/locale/hu_HU/fusiondirectory.po       |    2 +-
 postfix/locale/id/fusiondirectory.po          |    2 +-
 postfix/locale/it_IT/fusiondirectory.po       |    2 +-
 postfix/locale/lv/fusiondirectory.po          |    2 +-
 postfix/locale/nb/fusiondirectory.po          |    2 +-
 postfix/locale/nl/fusiondirectory.po          |    2 +-
 postfix/locale/pl/fusiondirectory.po          |    2 +-
 postfix/locale/pt/fusiondirectory.po          |    2 +-
 postfix/locale/pt_BR/fusiondirectory.po       |    2 +-
 postfix/locale/ru/fusiondirectory.po          |    2 +-
 postfix/locale/ru@petr1708/fusiondirectory.po |    2 +-
 postfix/locale/sv/fusiondirectory.po          |    2 +-
 postfix/locale/ug/fusiondirectory.po          |    2 +-
 postfix/locale/vi_VN/fusiondirectory.po       |    2 +-
 postfix/locale/zh/fusiondirectory.po          |    2 +-
 ppolicy/locale/ar/fusiondirectory.po          |  256 +--
 ppolicy/locale/ca/fusiondirectory.po          |  256 +--
 ppolicy/locale/cs_CZ/fusiondirectory.po       |  256 +--
 ppolicy/locale/de/fusiondirectory.po          |  256 +--
 ppolicy/locale/el_GR/fusiondirectory.po       |  256 +--
 ppolicy/locale/es/fusiondirectory.po          |  256 +--
 ppolicy/locale/es_CO/fusiondirectory.po       |  256 +--
 ppolicy/locale/es_VE/fusiondirectory.po       |  256 +--
 ppolicy/locale/fa_IR/fusiondirectory.po       |  256 +--
 ppolicy/locale/fi_FI/fusiondirectory.po       |  256 +--
 ppolicy/locale/fr/fusiondirectory.po          |  256 +--
 ppolicy/locale/hu_HU/fusiondirectory.po       |  256 +--
 ppolicy/locale/id/fusiondirectory.po          |  256 +--
 ppolicy/locale/it_IT/fusiondirectory.po       |  256 +--
 ppolicy/locale/lv/fusiondirectory.po          |  256 +--
 ppolicy/locale/nb/fusiondirectory.po          |  256 +--
 ppolicy/locale/nl/fusiondirectory.po          |  256 +--
 ppolicy/locale/pl/fusiondirectory.po          |  256 +--
 ppolicy/locale/pt/fusiondirectory.po          |  256 +--
 ppolicy/locale/pt_BR/fusiondirectory.po       |  256 +--
 ppolicy/locale/ru/fusiondirectory.po          |  256 +--
 ppolicy/locale/ru@petr1708/fusiondirectory.po |  256 +--
 ppolicy/locale/sv/fusiondirectory.po          |  256 +--
 ppolicy/locale/ug/fusiondirectory.po          |  256 +--
 ppolicy/locale/vi_VN/fusiondirectory.po       |  256 +--
 ppolicy/locale/zh/fusiondirectory.po          |  256 +--
 puppet/locale/ar/fusiondirectory.po           |    2 +-
 puppet/locale/ca/fusiondirectory.po           |    2 +-
 puppet/locale/cs_CZ/fusiondirectory.po        |    2 +-
 puppet/locale/de/fusiondirectory.po           |    2 +-
 puppet/locale/el_GR/fusiondirectory.po        |    2 +-
 puppet/locale/es/fusiondirectory.po           |    2 +-
 puppet/locale/es_CO/fusiondirectory.po        |    2 +-
 puppet/locale/es_VE/fusiondirectory.po        |    2 +-
 puppet/locale/fa_IR/fusiondirectory.po        |    2 +-
 puppet/locale/fi_FI/fusiondirectory.po        |    2 +-
 puppet/locale/fr/fusiondirectory.po           |    2 +-
 puppet/locale/hu_HU/fusiondirectory.po        |    2 +-
 puppet/locale/id/fusiondirectory.po           |    2 +-
 puppet/locale/it_IT/fusiondirectory.po        |    2 +-
 puppet/locale/lv/fusiondirectory.po           |    2 +-
 puppet/locale/nb/fusiondirectory.po           |    2 +-
 puppet/locale/nl/fusiondirectory.po           |    2 +-
 puppet/locale/pl/fusiondirectory.po           |    2 +-
 puppet/locale/pt/fusiondirectory.po           |    2 +-
 puppet/locale/pt_BR/fusiondirectory.po        |    2 +-
 puppet/locale/ru/fusiondirectory.po           |    2 +-
 puppet/locale/ru@petr1708/fusiondirectory.po  |    2 +-
 puppet/locale/sv/fusiondirectory.po           |    2 +-
 puppet/locale/ug/fusiondirectory.po           |    2 +-
 puppet/locale/vi_VN/fusiondirectory.po        |    2 +-
 puppet/locale/zh/fusiondirectory.po           |    2 +-
 pureftpd/locale/ar/fusiondirectory.po         |    2 +-
 pureftpd/locale/ca/fusiondirectory.po         |    2 +-
 pureftpd/locale/cs_CZ/fusiondirectory.po      |    2 +-
 pureftpd/locale/de/fusiondirectory.po         |    2 +-
 pureftpd/locale/el_GR/fusiondirectory.po      |    2 +-
 pureftpd/locale/es/fusiondirectory.po         |    2 +-
 pureftpd/locale/es_CO/fusiondirectory.po      |    2 +-
 pureftpd/locale/es_VE/fusiondirectory.po      |    2 +-
 pureftpd/locale/fa_IR/fusiondirectory.po      |    2 +-
 pureftpd/locale/fi_FI/fusiondirectory.po      |    2 +-
 pureftpd/locale/fr/fusiondirectory.po         |    2 +-
 pureftpd/locale/hu_HU/fusiondirectory.po      |    2 +-
 pureftpd/locale/id/fusiondirectory.po         |    2 +-
 pureftpd/locale/it_IT/fusiondirectory.po      |    2 +-
 pureftpd/locale/lv/fusiondirectory.po         |    2 +-
 pureftpd/locale/nb/fusiondirectory.po         |    2 +-
 pureftpd/locale/nl/fusiondirectory.po         |    2 +-
 pureftpd/locale/pl/fusiondirectory.po         |    2 +-
 pureftpd/locale/pt/fusiondirectory.po         |    2 +-
 pureftpd/locale/pt_BR/fusiondirectory.po      |    2 +-
 pureftpd/locale/ru/fusiondirectory.po         |    2 +-
 .../locale/ru@petr1708/fusiondirectory.po     |    2 +-
 pureftpd/locale/sv/fusiondirectory.po         |    2 +-
 pureftpd/locale/ug/fusiondirectory.po         |    2 +-
 pureftpd/locale/vi_VN/fusiondirectory.po      |    2 +-
 pureftpd/locale/zh/fusiondirectory.po         |    2 +-
 quota/locale/ar/fusiondirectory.po            |  132 +-
 quota/locale/ca/fusiondirectory.po            |  132 +-
 quota/locale/cs_CZ/fusiondirectory.po         |  132 +-
 quota/locale/de/fusiondirectory.po            |  132 +-
 quota/locale/el_GR/fusiondirectory.po         |  132 +-
 quota/locale/es/fusiondirectory.po            |  132 +-
 quota/locale/es_CO/fusiondirectory.po         |  132 +-
 quota/locale/es_VE/fusiondirectory.po         |  132 +-
 quota/locale/fa_IR/fusiondirectory.po         |  132 +-
 quota/locale/fi_FI/fusiondirectory.po         |  132 +-
 quota/locale/fr/fusiondirectory.po            |  132 +-
 quota/locale/hu_HU/fusiondirectory.po         |  132 +-
 quota/locale/id/fusiondirectory.po            |  132 +-
 quota/locale/it_IT/fusiondirectory.po         |  132 +-
 quota/locale/lv/fusiondirectory.po            |  132 +-
 quota/locale/nb/fusiondirectory.po            |  132 +-
 quota/locale/nl/fusiondirectory.po            |  132 +-
 quota/locale/pl/fusiondirectory.po            |  132 +-
 quota/locale/pt/fusiondirectory.po            |  132 +-
 quota/locale/pt_BR/fusiondirectory.po         |  132 +-
 quota/locale/ru/fusiondirectory.po            |  132 +-
 quota/locale/ru@petr1708/fusiondirectory.po   |  132 +-
 quota/locale/sv/fusiondirectory.po            |  132 +-
 quota/locale/ug/fusiondirectory.po            |  132 +-
 quota/locale/vi_VN/fusiondirectory.po         |  132 +-
 quota/locale/zh/fusiondirectory.po            |  132 +-
 repository/locale/ar/fusiondirectory.po       |  144 +-
 repository/locale/ca/fusiondirectory.po       |  144 +-
 repository/locale/cs_CZ/fusiondirectory.po    |  170 +-
 repository/locale/de/fusiondirectory.po       |  158 +-
 repository/locale/el_GR/fusiondirectory.po    |  170 +-
 repository/locale/es/fusiondirectory.po       |  146 +-
 repository/locale/es_CO/fusiondirectory.po    |  144 +-
 repository/locale/es_VE/fusiondirectory.po    |  146 +-
 repository/locale/fa_IR/fusiondirectory.po    |  144 +-
 repository/locale/fi_FI/fusiondirectory.po    |  144 +-
 repository/locale/fr/fusiondirectory.po       |  170 +-
 repository/locale/hu_HU/fusiondirectory.po    |  144 +-
 repository/locale/id/fusiondirectory.po       |  144 +-
 repository/locale/it_IT/fusiondirectory.po    |  170 +-
 repository/locale/lv/fusiondirectory.po       |  158 +-
 repository/locale/nb/fusiondirectory.po       |  144 +-
 repository/locale/nl/fusiondirectory.po       |  146 +-
 repository/locale/pl/fusiondirectory.po       |  146 +-
 repository/locale/pt/fusiondirectory.po       |  144 +-
 repository/locale/pt_BR/fusiondirectory.po    |  170 +-
 repository/locale/ru/fusiondirectory.po       |  144 +-
 .../locale/ru@petr1708/fusiondirectory.po     |  144 +-
 repository/locale/sv/fusiondirectory.po       |  146 +-
 repository/locale/ug/fusiondirectory.po       |  144 +-
 repository/locale/vi_VN/fusiondirectory.po    |  144 +-
 repository/locale/zh/fusiondirectory.po       |  146 +-
 samba/locale/ar/fusiondirectory.po            |  694 ++++----
 samba/locale/ca/fusiondirectory.po            |  694 ++++----
 samba/locale/cs_CZ/fusiondirectory.po         |  566 +++----
 samba/locale/de/fusiondirectory.po            |  566 +++----
 samba/locale/el_GR/fusiondirectory.po         |  566 +++----
 samba/locale/es/fusiondirectory.po            |  566 +++----
 samba/locale/es_CO/fusiondirectory.po         |  716 ++++-----
 samba/locale/es_VE/fusiondirectory.po         |  566 +++----
 samba/locale/fa_IR/fusiondirectory.po         |  680 ++++----
 samba/locale/fi_FI/fusiondirectory.po         |  694 ++++----
 samba/locale/fr/fusiondirectory.po            |  568 +++----
 samba/locale/hu_HU/fusiondirectory.po         |  688 ++++----
 samba/locale/id/fusiondirectory.po            |  680 ++++----
 samba/locale/it_IT/fusiondirectory.po         |  566 +++----
 samba/locale/lv/fusiondirectory.po            |  694 ++++----
 samba/locale/nb/fusiondirectory.po            |  692 ++++----
 samba/locale/nl/fusiondirectory.po            |  566 +++----
 samba/locale/pl/fusiondirectory.po            |  800 ++++-----
 samba/locale/pt/fusiondirectory.po            |  728 ++++-----
 samba/locale/pt_BR/fusiondirectory.po         |  566 +++----
 samba/locale/ru/fusiondirectory.po            |  566 +++----
 samba/locale/ru@petr1708/fusiondirectory.po   |  680 ++++----
 samba/locale/sv/fusiondirectory.po            |  752 ++++-----
 samba/locale/ug/fusiondirectory.po            |  680 ++++----
 samba/locale/vi_VN/fusiondirectory.po         |  744 ++++-----
 samba/locale/zh/fusiondirectory.po            |  800 ++++-----
 sogo/locale/ar/fusiondirectory.po             |   44 +-
 sogo/locale/ca/fusiondirectory.po             |   44 +-
 sogo/locale/cs_CZ/fusiondirectory.po          |   44 +-
 sogo/locale/de/fusiondirectory.po             |   44 +-
 sogo/locale/el_GR/fusiondirectory.po          |   44 +-
 sogo/locale/es/fusiondirectory.po             |   44 +-
 sogo/locale/es_CO/fusiondirectory.po          |   44 +-
 sogo/locale/es_VE/fusiondirectory.po          |   44 +-
 sogo/locale/fa_IR/fusiondirectory.po          |   44 +-
 sogo/locale/fi_FI/fusiondirectory.po          |   44 +-
 sogo/locale/fr/fusiondirectory.po             |   44 +-
 sogo/locale/hu_HU/fusiondirectory.po          |   44 +-
 sogo/locale/id/fusiondirectory.po             |   44 +-
 sogo/locale/it_IT/fusiondirectory.po          |   44 +-
 sogo/locale/lv/fusiondirectory.po             |   44 +-
 sogo/locale/nb/fusiondirectory.po             |   44 +-
 sogo/locale/nl/fusiondirectory.po             |   44 +-
 sogo/locale/pl/fusiondirectory.po             |   44 +-
 sogo/locale/pt/fusiondirectory.po             |   44 +-
 sogo/locale/pt_BR/fusiondirectory.po          |   44 +-
 sogo/locale/ru/fusiondirectory.po             |   44 +-
 sogo/locale/ru@petr1708/fusiondirectory.po    |   44 +-
 sogo/locale/sv/fusiondirectory.po             |   44 +-
 sogo/locale/ug/fusiondirectory.po             |   44 +-
 sogo/locale/vi_VN/fusiondirectory.po          |   44 +-
 sogo/locale/zh/fusiondirectory.po             |   44 +-
 spamassassin/locale/ar/fusiondirectory.po     |   74 +-
 spamassassin/locale/ca/fusiondirectory.po     |   74 +-
 spamassassin/locale/cs_CZ/fusiondirectory.po  |   74 +-
 spamassassin/locale/de/fusiondirectory.po     |   74 +-
 spamassassin/locale/el_GR/fusiondirectory.po  |   74 +-
 spamassassin/locale/es/fusiondirectory.po     |   74 +-
 spamassassin/locale/es_CO/fusiondirectory.po  |   74 +-
 spamassassin/locale/es_VE/fusiondirectory.po  |   74 +-
 spamassassin/locale/fa_IR/fusiondirectory.po  |   74 +-
 spamassassin/locale/fi_FI/fusiondirectory.po  |   74 +-
 spamassassin/locale/fr/fusiondirectory.po     |   74 +-
 spamassassin/locale/hu_HU/fusiondirectory.po  |   74 +-
 spamassassin/locale/id/fusiondirectory.po     |   74 +-
 spamassassin/locale/it_IT/fusiondirectory.po  |   74 +-
 spamassassin/locale/lv/fusiondirectory.po     |   74 +-
 spamassassin/locale/nb/fusiondirectory.po     |   74 +-
 spamassassin/locale/nl/fusiondirectory.po     |   74 +-
 spamassassin/locale/pl/fusiondirectory.po     |   74 +-
 spamassassin/locale/pt/fusiondirectory.po     |   74 +-
 spamassassin/locale/pt_BR/fusiondirectory.po  |   74 +-
 spamassassin/locale/ru/fusiondirectory.po     |   74 +-
 .../locale/ru@petr1708/fusiondirectory.po     |   74 +-
 spamassassin/locale/sv/fusiondirectory.po     |   74 +-
 spamassassin/locale/ug/fusiondirectory.po     |   74 +-
 spamassassin/locale/vi_VN/fusiondirectory.po  |   74 +-
 spamassassin/locale/zh/fusiondirectory.po     |   74 +-
 squid/locale/ar/fusiondirectory.po            |    2 +-
 squid/locale/ca/fusiondirectory.po            |    2 +-
 squid/locale/cs_CZ/fusiondirectory.po         |    2 +-
 squid/locale/de/fusiondirectory.po            |    2 +-
 squid/locale/el_GR/fusiondirectory.po         |    2 +-
 squid/locale/es/fusiondirectory.po            |    2 +-
 squid/locale/es_CO/fusiondirectory.po         |    2 +-
 squid/locale/es_VE/fusiondirectory.po         |    2 +-
 squid/locale/fa_IR/fusiondirectory.po         |    2 +-
 squid/locale/fi_FI/fusiondirectory.po         |    2 +-
 squid/locale/fr/fusiondirectory.po            |    2 +-
 squid/locale/hu_HU/fusiondirectory.po         |    2 +-
 squid/locale/id/fusiondirectory.po            |    2 +-
 squid/locale/it_IT/fusiondirectory.po         |    2 +-
 squid/locale/lv/fusiondirectory.po            |    2 +-
 squid/locale/nb/fusiondirectory.po            |    2 +-
 squid/locale/nl/fusiondirectory.po            |    2 +-
 squid/locale/pl/fusiondirectory.po            |    2 +-
 squid/locale/pt/fusiondirectory.po            |    2 +-
 squid/locale/pt_BR/fusiondirectory.po         |    2 +-
 squid/locale/ru/fusiondirectory.po            |    2 +-
 squid/locale/ru@petr1708/fusiondirectory.po   |    2 +-
 squid/locale/sv/fusiondirectory.po            |    2 +-
 squid/locale/ug/fusiondirectory.po            |    2 +-
 squid/locale/vi_VN/fusiondirectory.po         |    2 +-
 squid/locale/zh/fusiondirectory.po            |    2 +-
 ssh/locale/ar/fusiondirectory.po              |    2 +-
 ssh/locale/ca/fusiondirectory.po              |    2 +-
 ssh/locale/cs_CZ/fusiondirectory.po           |    2 +-
 ssh/locale/de/fusiondirectory.po              |    2 +-
 ssh/locale/el_GR/fusiondirectory.po           |    2 +-
 ssh/locale/es/fusiondirectory.po              |    2 +-
 ssh/locale/es_CO/fusiondirectory.po           |    2 +-
 ssh/locale/es_VE/fusiondirectory.po           |    2 +-
 ssh/locale/fa_IR/fusiondirectory.po           |    2 +-
 ssh/locale/fi_FI/fusiondirectory.po           |    2 +-
 ssh/locale/fr/fusiondirectory.po              |    2 +-
 ssh/locale/hu_HU/fusiondirectory.po           |    2 +-
 ssh/locale/id/fusiondirectory.po              |    2 +-
 ssh/locale/it_IT/fusiondirectory.po           |    2 +-
 ssh/locale/lv/fusiondirectory.po              |    2 +-
 ssh/locale/nb/fusiondirectory.po              |    2 +-
 ssh/locale/nl/fusiondirectory.po              |    2 +-
 ssh/locale/pl/fusiondirectory.po              |    2 +-
 ssh/locale/pt/fusiondirectory.po              |    2 +-
 ssh/locale/pt_BR/fusiondirectory.po           |    2 +-
 ssh/locale/ru/fusiondirectory.po              |    2 +-
 ssh/locale/ru@petr1708/fusiondirectory.po     |    2 +-
 ssh/locale/sv/fusiondirectory.po              |    2 +-
 ssh/locale/ug/fusiondirectory.po              |    2 +-
 ssh/locale/vi_VN/fusiondirectory.po           |    2 +-
 ssh/locale/zh/fusiondirectory.po              |    2 +-
 subcontracting/locale/ar/fusiondirectory.po   |    2 +-
 subcontracting/locale/ca/fusiondirectory.po   |    2 +-
 .../locale/cs_CZ/fusiondirectory.po           |    2 +-
 subcontracting/locale/de/fusiondirectory.po   |    2 +-
 .../locale/el_GR/fusiondirectory.po           |    2 +-
 subcontracting/locale/es/fusiondirectory.po   |    2 +-
 .../locale/es_CO/fusiondirectory.po           |    2 +-
 .../locale/es_VE/fusiondirectory.po           |    2 +-
 .../locale/fa_IR/fusiondirectory.po           |    2 +-
 .../locale/fi_FI/fusiondirectory.po           |    2 +-
 subcontracting/locale/fr/fusiondirectory.po   |    2 +-
 .../locale/hu_HU/fusiondirectory.po           |    2 +-
 subcontracting/locale/id/fusiondirectory.po   |    2 +-
 .../locale/it_IT/fusiondirectory.po           |    2 +-
 subcontracting/locale/lv/fusiondirectory.po   |    2 +-
 subcontracting/locale/nb/fusiondirectory.po   |    2 +-
 subcontracting/locale/nl/fusiondirectory.po   |    2 +-
 subcontracting/locale/pl/fusiondirectory.po   |    2 +-
 subcontracting/locale/pt/fusiondirectory.po   |    2 +-
 .../locale/pt_BR/fusiondirectory.po           |    2 +-
 subcontracting/locale/ru/fusiondirectory.po   |    2 +-
 .../locale/ru@petr1708/fusiondirectory.po     |    2 +-
 subcontracting/locale/sv/fusiondirectory.po   |    2 +-
 subcontracting/locale/ug/fusiondirectory.po   |    2 +-
 .../locale/vi_VN/fusiondirectory.po           |    2 +-
 subcontracting/locale/zh/fusiondirectory.po   |    2 +-
 sudo/locale/ar/fusiondirectory.po             |   88 +-
 sudo/locale/ca/fusiondirectory.po             |   88 +-
 sudo/locale/cs_CZ/fusiondirectory.po          |   88 +-
 sudo/locale/de/fusiondirectory.po             |   88 +-
 sudo/locale/el_GR/fusiondirectory.po          |   88 +-
 sudo/locale/es/fusiondirectory.po             |   88 +-
 sudo/locale/es_CO/fusiondirectory.po          |   88 +-
 sudo/locale/es_VE/fusiondirectory.po          |   88 +-
 sudo/locale/fa_IR/fusiondirectory.po          |   88 +-
 sudo/locale/fi_FI/fusiondirectory.po          |   88 +-
 sudo/locale/fr/fusiondirectory.po             |   88 +-
 sudo/locale/hu_HU/fusiondirectory.po          |   88 +-
 sudo/locale/id/fusiondirectory.po             |   88 +-
 sudo/locale/it_IT/fusiondirectory.po          |   88 +-
 sudo/locale/lv/fusiondirectory.po             |   88 +-
 sudo/locale/nb/fusiondirectory.po             |   88 +-
 sudo/locale/nl/fusiondirectory.po             |   88 +-
 sudo/locale/pl/fusiondirectory.po             |   88 +-
 sudo/locale/pt/fusiondirectory.po             |   88 +-
 sudo/locale/pt_BR/fusiondirectory.po          |   88 +-
 sudo/locale/ru/fusiondirectory.po             |   88 +-
 sudo/locale/ru@petr1708/fusiondirectory.po    |   88 +-
 sudo/locale/sv/fusiondirectory.po             |   88 +-
 sudo/locale/ug/fusiondirectory.po             |   88 +-
 sudo/locale/vi_VN/fusiondirectory.po          |   88 +-
 sudo/locale/zh/fusiondirectory.po             |   88 +-
 supann/locale/ar/fusiondirectory.po           |  464 +++---
 supann/locale/ca/fusiondirectory.po           |  464 +++---
 supann/locale/cs_CZ/fusiondirectory.po        |  464 +++---
 supann/locale/de/fusiondirectory.po           |  464 +++---
 supann/locale/el_GR/fusiondirectory.po        |  464 +++---
 supann/locale/es/fusiondirectory.po           |  464 +++---
 supann/locale/es_CO/fusiondirectory.po        |  464 +++---
 supann/locale/es_VE/fusiondirectory.po        |  464 +++---
 supann/locale/fa_IR/fusiondirectory.po        |  464 +++---
 supann/locale/fi_FI/fusiondirectory.po        |  464 +++---
 supann/locale/fr/fusiondirectory.po           |  464 +++---
 supann/locale/hu_HU/fusiondirectory.po        |  464 +++---
 supann/locale/id/fusiondirectory.po           |  464 +++---
 supann/locale/it_IT/fusiondirectory.po        |  464 +++---
 supann/locale/lv/fusiondirectory.po           |  464 +++---
 supann/locale/nb/fusiondirectory.po           |  464 +++---
 supann/locale/nl/fusiondirectory.po           |  464 +++---
 supann/locale/pl/fusiondirectory.po           |  464 +++---
 supann/locale/pt/fusiondirectory.po           |  464 +++---
 supann/locale/pt_BR/fusiondirectory.po        |  464 +++---
 supann/locale/ru/fusiondirectory.po           |  464 +++---
 supann/locale/ru@petr1708/fusiondirectory.po  |  464 +++---
 supann/locale/sv/fusiondirectory.po           |  464 +++---
 supann/locale/ug/fusiondirectory.po           |  464 +++---
 supann/locale/vi_VN/fusiondirectory.po        |  464 +++---
 supann/locale/zh/fusiondirectory.po           |  464 +++---
 sympa/locale/ar/fusiondirectory.po            |    2 +-
 sympa/locale/ca/fusiondirectory.po            |    2 +-
 sympa/locale/cs_CZ/fusiondirectory.po         |    2 +-
 sympa/locale/de/fusiondirectory.po            |    2 +-
 sympa/locale/el_GR/fusiondirectory.po         |    2 +-
 sympa/locale/es/fusiondirectory.po            |    2 +-
 sympa/locale/es_CO/fusiondirectory.po         |    2 +-
 sympa/locale/es_VE/fusiondirectory.po         |    2 +-
 sympa/locale/fa_IR/fusiondirectory.po         |    2 +-
 sympa/locale/fi_FI/fusiondirectory.po         |    2 +-
 sympa/locale/fr/fusiondirectory.po            |    2 +-
 sympa/locale/hu_HU/fusiondirectory.po         |    2 +-
 sympa/locale/id/fusiondirectory.po            |    2 +-
 sympa/locale/it_IT/fusiondirectory.po         |    2 +-
 sympa/locale/lv/fusiondirectory.po            |    2 +-
 sympa/locale/nb/fusiondirectory.po            |    2 +-
 sympa/locale/nl/fusiondirectory.po            |    2 +-
 sympa/locale/pl/fusiondirectory.po            |    2 +-
 sympa/locale/pt/fusiondirectory.po            |    2 +-
 sympa/locale/pt_BR/fusiondirectory.po         |    2 +-
 sympa/locale/ru/fusiondirectory.po            |    2 +-
 sympa/locale/ru@petr1708/fusiondirectory.po   |    2 +-
 sympa/locale/sv/fusiondirectory.po            |    2 +-
 sympa/locale/ug/fusiondirectory.po            |    2 +-
 sympa/locale/vi_VN/fusiondirectory.po         |    2 +-
 sympa/locale/zh/fusiondirectory.po            |    2 +-
 systems/locale/ar/fusiondirectory.po          | 1291 ++++++++-------
 systems/locale/ca/fusiondirectory.po          | 1241 +++++++-------
 systems/locale/cs_CZ/fusiondirectory.po       | 1427 ++++++++---------
 systems/locale/de/fusiondirectory.po          | 1421 ++++++++--------
 systems/locale/el_GR/fusiondirectory.po       | 1411 ++++++++--------
 systems/locale/es/fusiondirectory.po          | 1329 ++++++++-------
 systems/locale/es_CO/fusiondirectory.po       | 1285 ++++++++-------
 systems/locale/es_VE/fusiondirectory.po       | 1291 ++++++++-------
 systems/locale/fa_IR/fusiondirectory.po       | 1235 +++++++-------
 systems/locale/fi_FI/fusiondirectory.po       | 1255 +++++++--------
 systems/locale/fr/fusiondirectory.po          | 1423 ++++++++--------
 systems/locale/hu_HU/fusiondirectory.po       | 1243 +++++++-------
 systems/locale/id/fusiondirectory.po          | 1237 +++++++-------
 systems/locale/it_IT/fusiondirectory.po       | 1421 ++++++++--------
 systems/locale/lv/fusiondirectory.po          | 1265 +++++++--------
 systems/locale/nb/fusiondirectory.po          | 1257 +++++++--------
 systems/locale/nl/fusiondirectory.po          | 1341 ++++++++--------
 systems/locale/pl/fusiondirectory.po          | 1311 ++++++++-------
 systems/locale/pt/fusiondirectory.po          | 1267 +++++++--------
 systems/locale/pt_BR/fusiondirectory.po       | 1241 +++++++-------
 systems/locale/ru/fusiondirectory.po          | 1419 ++++++++--------
 systems/locale/ru@petr1708/fusiondirectory.po | 1239 +++++++-------
 systems/locale/sv/fusiondirectory.po          | 1311 ++++++++-------
 systems/locale/ug/fusiondirectory.po          | 1237 +++++++-------
 systems/locale/vi_VN/fusiondirectory.po       | 1289 ++++++++-------
 systems/locale/zh/fusiondirectory.po          | 1309 ++++++++-------
 user-reminder/locale/ar/fusiondirectory.po    |   38 +-
 user-reminder/locale/ca/fusiondirectory.po    |   38 +-
 user-reminder/locale/cs_CZ/fusiondirectory.po |   38 +-
 user-reminder/locale/de/fusiondirectory.po    |   38 +-
 user-reminder/locale/el_GR/fusiondirectory.po |   38 +-
 user-reminder/locale/es/fusiondirectory.po    |   38 +-
 user-reminder/locale/es_CO/fusiondirectory.po |   38 +-
 user-reminder/locale/es_VE/fusiondirectory.po |   38 +-
 user-reminder/locale/fa_IR/fusiondirectory.po |   38 +-
 user-reminder/locale/fi_FI/fusiondirectory.po |   38 +-
 user-reminder/locale/fr/fusiondirectory.po    |   38 +-
 user-reminder/locale/hu_HU/fusiondirectory.po |   38 +-
 user-reminder/locale/id/fusiondirectory.po    |   38 +-
 user-reminder/locale/it_IT/fusiondirectory.po |   38 +-
 user-reminder/locale/lv/fusiondirectory.po    |   38 +-
 user-reminder/locale/nb/fusiondirectory.po    |   38 +-
 user-reminder/locale/nl/fusiondirectory.po    |   38 +-
 user-reminder/locale/pl/fusiondirectory.po    |   38 +-
 user-reminder/locale/pt/fusiondirectory.po    |   38 +-
 user-reminder/locale/pt_BR/fusiondirectory.po |   38 +-
 user-reminder/locale/ru/fusiondirectory.po    |   38 +-
 .../locale/ru@petr1708/fusiondirectory.po     |   38 +-
 user-reminder/locale/sv/fusiondirectory.po    |   38 +-
 user-reminder/locale/ug/fusiondirectory.po    |   38 +-
 user-reminder/locale/vi_VN/fusiondirectory.po |   38 +-
 user-reminder/locale/zh/fusiondirectory.po    |   38 +-
 weblink/locale/ar/fusiondirectory.po          |    2 +-
 weblink/locale/ca/fusiondirectory.po          |    2 +-
 weblink/locale/cs_CZ/fusiondirectory.po       |    2 +-
 weblink/locale/de/fusiondirectory.po          |    2 +-
 weblink/locale/el_GR/fusiondirectory.po       |    2 +-
 weblink/locale/es/fusiondirectory.po          |    2 +-
 weblink/locale/es_CO/fusiondirectory.po       |    2 +-
 weblink/locale/es_VE/fusiondirectory.po       |    2 +-
 weblink/locale/fa_IR/fusiondirectory.po       |    2 +-
 weblink/locale/fi_FI/fusiondirectory.po       |    2 +-
 weblink/locale/fr/fusiondirectory.po          |    2 +-
 weblink/locale/hu_HU/fusiondirectory.po       |    2 +-
 weblink/locale/id/fusiondirectory.po          |    2 +-
 weblink/locale/it_IT/fusiondirectory.po       |    2 +-
 weblink/locale/lv/fusiondirectory.po          |    2 +-
 weblink/locale/nb/fusiondirectory.po          |    2 +-
 weblink/locale/nl/fusiondirectory.po          |    2 +-
 weblink/locale/pl/fusiondirectory.po          |    2 +-
 weblink/locale/pt/fusiondirectory.po          |    2 +-
 weblink/locale/pt_BR/fusiondirectory.po       |    2 +-
 weblink/locale/ru/fusiondirectory.po          |    2 +-
 weblink/locale/ru@petr1708/fusiondirectory.po |    2 +-
 weblink/locale/sv/fusiondirectory.po          |    2 +-
 weblink/locale/ug/fusiondirectory.po          |    2 +-
 weblink/locale/vi_VN/fusiondirectory.po       |    2 +-
 weblink/locale/zh/fusiondirectory.po          |    2 +-
 webservice/locale/ar/fusiondirectory.po       |   50 +-
 webservice/locale/ca/fusiondirectory.po       |   50 +-
 webservice/locale/cs_CZ/fusiondirectory.po    |   50 +-
 webservice/locale/de/fusiondirectory.po       |   50 +-
 webservice/locale/el_GR/fusiondirectory.po    |   50 +-
 webservice/locale/es/fusiondirectory.po       |   50 +-
 webservice/locale/es_CO/fusiondirectory.po    |   50 +-
 webservice/locale/es_VE/fusiondirectory.po    |   50 +-
 webservice/locale/fa_IR/fusiondirectory.po    |   50 +-
 webservice/locale/fi_FI/fusiondirectory.po    |   50 +-
 webservice/locale/fr/fusiondirectory.po       |   50 +-
 webservice/locale/hu_HU/fusiondirectory.po    |   50 +-
 webservice/locale/id/fusiondirectory.po       |   50 +-
 webservice/locale/it_IT/fusiondirectory.po    |   50 +-
 webservice/locale/lv/fusiondirectory.po       |   50 +-
 webservice/locale/nb/fusiondirectory.po       |   50 +-
 webservice/locale/nl/fusiondirectory.po       |   50 +-
 webservice/locale/pl/fusiondirectory.po       |   50 +-
 webservice/locale/pt/fusiondirectory.po       |   50 +-
 webservice/locale/pt_BR/fusiondirectory.po    |   50 +-
 webservice/locale/ru/fusiondirectory.po       |   50 +-
 .../locale/ru@petr1708/fusiondirectory.po     |   50 +-
 webservice/locale/sv/fusiondirectory.po       |   50 +-
 webservice/locale/ug/fusiondirectory.po       |   50 +-
 webservice/locale/vi_VN/fusiondirectory.po    |   50 +-
 webservice/locale/zh/fusiondirectory.po       |   50 +-
 1274 files changed, 99408 insertions(+), 97625 deletions(-)

diff --git a/alias/locale/ar/fusiondirectory.po b/alias/locale/ar/fusiondirectory.po
index 64d991487a..adb5ca1163 100644
--- a/alias/locale/ar/fusiondirectory.po
+++ b/alias/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,62 +17,24 @@ 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/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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "الإسم"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "الوصف"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "الإسم"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "الوصف"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/ca/fusiondirectory.po b/alias/locale/ca/fusiondirectory.po
index 9191fa08e2..4077520042 100644
--- a/alias/locale/ca/fusiondirectory.po
+++ b/alias/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: ca\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Nom"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Nom"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/cs_CZ/fusiondirectory.po b/alias/locale/cs_CZ/fusiondirectory.po
index e04afa2b6d..b2581da896 100644
--- a/alias/locale/cs_CZ/fusiondirectory.po
+++ b/alias/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,63 +17,25 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/alias/class_mailAliasDistribution.inc:31
-#: admin/alias/class_mailAliasDistribution.inc:32
-#: admin/alias/class_mailAliasDistribution.inc:35
-msgid "Temporary mail distribution"
-msgstr "Dočasná distribuce e-mailů"
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr "Distribuce e-mailů"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Název"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr "Název identifikující tento alternativní název"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Popis"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr "Popis tohoto alternativního názvu"
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "E-mailová adresa"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr "Alternativní e-mailové adresy"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
-msgstr "Alternativa této e-mailové adresy"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr "Nastavení alternativního názvu"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "E-mailový server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr "Nastavení zásuvného modulu alias pro FusionDirecotry"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr "Poštovní server pro tento alternativní název"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "alternativní název (alias)"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Datum skončení platnosti"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr "Relativní rozlišený název alternativního názvu"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Datum po kterém by měl být alternativní název automaticky smazán. Pro nemazání ponechte nevyplněné."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr "Větev, ve které budou ukládány alternativní názvy"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -85,10 +47,20 @@ msgstr "Dočasné přesměrování e-mailů"
 msgid "Mail redirection"
 msgstr "Přesměrování e-mailu"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Název"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Název identifikující toto přesměrování"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Popis"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Popis tohoto přesměrování"
@@ -109,12 +81,60 @@ msgstr "Přesměrovat na"
 msgid "Destination of this redirection"
 msgstr "Cíl tohoto přesměrování"
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Datum skončení platnosti"
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr "Datum, po kterém by mělo být toto přesměrování samočinně smazáno. Pro nemazání ponechte prázdné."
 
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr "Dočasná distribuce e-mailů"
+
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
+msgstr "Distribuce e-mailů"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
+msgstr "Název identifikující tento alternativní název"
+
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
+msgstr "Popis tohoto alternativního názvu"
+
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "E-mailová adresa"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
+msgstr "Alternativní e-mailové adresy"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr "Alternativa této e-mailové adresy"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "E-mailový server"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr "Poštovní server pro tento alternativní název"
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr "Datum po kterém by měl být alternativní název automaticky smazán. Pro nemazání ponechte nevyplněné."
+
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
 msgstr "Alternativní názvy"
@@ -126,23 +146,3 @@ msgstr "Správa alternativních názvů (alias)"
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
 msgstr "Alternativní názvy e-mailu"
-
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
-msgstr "Nastavení alternativního názvu"
-
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
-msgstr "Nastavení zásuvného modulu alias pro FusionDirecotry"
-
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
-msgstr "alternativní název (alias)"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
-msgstr "Relativní rozlišený název alternativního názvu"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
-msgstr "Větev, ve které budou ukládány alternativní názvy"
diff --git a/alias/locale/de/fusiondirectory.po b/alias/locale/de/fusiondirectory.po
index b5d24175b1..a42175b144 100644
--- a/alias/locale/de/fusiondirectory.po
+++ b/alias/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,63 +18,25 @@ msgstr ""
 "Language: de\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 "Temporäre Mailverteilung"
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr "Mailverteilung"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Name"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr "Name um dieses Alias zu identifizieren"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Beschreibung"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr "Beschreibung dieses Alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Email-Adresse"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr "Emailaliase"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
-msgstr "Aliase für diese Emailadresse"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr "Aliaskonfiguration"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Mailserver"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr "FusionDirectory Alias Plugin-Konfiguration"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr ""
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "Alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Ablaufdatum"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr "Alias RDN"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Datum nach dem das Alias gelöscht werden soll. Leer lassen damit nicht gelöscht wird."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr "Zweig in welchem Aliase gespeichert werden"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -86,10 +48,20 @@ msgstr "Temporäre Mailumleitung"
 msgid "Mail redirection"
 msgstr "Mailweiterleitung"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Name"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Name um diese Umleitung zu identifizieren"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Beschreibung"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Beschreibung dieser Umleitung"
@@ -110,12 +82,60 @@ msgstr "Umleiten zu"
 msgid "Destination of this redirection"
 msgstr "Ziel dieser Umleitung"
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Ablaufdatum"
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr "Datum nach dem die Umleitung gelöscht werden soll. Leer lassen für keine Löschung."
 
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr "Temporäre Mailverteilung"
+
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
+msgstr "Mailverteilung"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
+msgstr "Name um dieses Alias zu identifizieren"
+
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
+msgstr "Beschreibung dieses Alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Email-Adresse"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
+msgstr "Emailaliase"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr "Aliase für diese Emailadresse"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Mailserver"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr "Datum nach dem das Alias gelöscht werden soll. Leer lassen damit nicht gelöscht wird."
+
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
 msgstr "Aliase"
@@ -127,23 +147,3 @@ msgstr "Aliasverwaltung"
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
 msgstr "Mailaliase"
-
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
-msgstr "Aliaskonfiguration"
-
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
-msgstr "FusionDirectory Alias Plugin-Konfiguration"
-
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
-msgstr "Alias"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
-msgstr "Alias RDN"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
-msgstr "Zweig in welchem Aliase gespeichert werden"
diff --git a/alias/locale/el_GR/fusiondirectory.po b/alias/locale/el_GR/fusiondirectory.po
index 5c5557d9de..3bacea1371 100644
--- a/alias/locale/el_GR/fusiondirectory.po
+++ b/alias/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,63 +18,25 @@ msgstr ""
 "Language: el_GR\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:53
-msgid "Mail distribution"
-msgstr "Διανομή αλληλογραφίας"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Όνομα"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr "Ένα όνομα με το οποίο θα αναγνωρίζεται αυτό το alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Περιγραφή"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr "Περιγραφή του alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Διευθύνση ηλεκτρονικής αλληλογγραφίας"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr "Aliases ηλ. αλληλογραφίας"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
-msgstr "Aliases αυτής της διεύθυνσης e-mail "
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr "Ρύθμιση Alias "
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Εξυπηρετητής αλληλογραφίας"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr "Διακομιστής αλληλογραφίας για αυτό το alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "Alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Ημερομηνία λήξης"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr "Alias RDN"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Ημερομηνία μετά από την οποία θα διαφράφεται το alias. Κενό για μην διαγραφή"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr "Κλάδος στον οποίο θα αποθηκεύονται τα aliases"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -86,10 +48,20 @@ msgstr "Προσωρινή ανακατεύθυνση αλληλογραφίας
 msgid "Mail redirection"
 msgstr "Ανακατεύθυνση αλληλογραφίας"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Όνομα"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Ένα όνομα με το οποίο θα αναγνωρίζεται αυτή η ανακατεύθυνση"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Περιγραφή"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Περιγραφή αυτής της ανακατεύθυνσης"
@@ -110,12 +82,60 @@ msgstr "Ανακατεύθυνση σε"
 msgid "Destination of this redirection"
 msgstr "Προορισμός αυτής της ανακατεύθυνσης"
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Ημερομηνία λήξης"
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr "Ημερομηνία μετά από την οποία θα διαφράφεται το alias. Αφήστε το κενό για μην διαγραφή"
 
+#: 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:53
+msgid "Mail distribution"
+msgstr "Διανομή αλληλογραφίας"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
+msgstr "Ένα όνομα με το οποίο θα αναγνωρίζεται αυτό το alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
+msgstr "Περιγραφή του alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Διευθύνση ηλεκτρονικής αλληλογγραφίας"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
+msgstr "Aliases ηλ. αλληλογραφίας"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr "Aliases αυτής της διεύθυνσης e-mail "
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Εξυπηρετητής αλληλογραφίας"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr "Διακομιστής αλληλογραφίας για αυτό το alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr "Ημερομηνία μετά από την οποία θα διαφράφεται το alias. Κενό για μην διαγραφή"
+
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
 msgstr "Ψευδώνυμα"
@@ -127,23 +147,3 @@ msgstr "Διαχείριση Alias "
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
 msgstr "Alias αλληλογραφίας"
-
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
-msgstr "Ρύθμιση Alias "
-
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory alias"
-
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
-msgstr "Alias"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
-msgstr "Alias RDN"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
-msgstr "Κλάδος στον οποίο θα αποθηκεύονται τα aliases"
diff --git a/alias/locale/es/fusiondirectory.po b/alias/locale/es/fusiondirectory.po
index 9ffcc1932a..04386f961e 100644
--- a/alias/locale/es/fusiondirectory.po
+++ b/alias/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: es\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Dirección de correo"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Servidor de correo"
-
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr ""
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "Alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Nombre"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Descripción"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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 "Alias"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Dirección de correo"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Servidor de correo"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
 msgstr "Alias"
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
 msgstr ""
diff --git a/alias/locale/es_CO/fusiondirectory.po b/alias/locale/es_CO/fusiondirectory.po
index 06fde83324..d8afe2af63 100644
--- a/alias/locale/es_CO/fusiondirectory.po
+++ b/alias/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: es_CO\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Dirección de correo"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Nombre"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Descripción"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Dirección de correo"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/es_VE/fusiondirectory.po b/alias/locale/es_VE/fusiondirectory.po
index 17739dc2af..7a78c5af06 100644
--- a/alias/locale/es_VE/fusiondirectory.po
+++ b/alias/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: es_VE\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Dirección de correo"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Servidor de correo"
-
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr ""
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "Alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Nombre"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Descripción"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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 "Alias"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Dirección de correo"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Servidor de correo"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
 msgstr "Alias"
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
 msgstr ""
diff --git a/alias/locale/fa_IR/fusiondirectory.po b/alias/locale/fa_IR/fusiondirectory.po
index 8b73671507..3faedd05ec 100644
--- a/alias/locale/fa_IR/fusiondirectory.po
+++ b/alias/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:30+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: fa_IR\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/fi_FI/fusiondirectory.po b/alias/locale/fi_FI/fusiondirectory.po
index 2eaea95bf6..dca5fb1a40 100644
--- a/alias/locale/fi_FI/fusiondirectory.po
+++ b/alias/locale/fi_FI/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-01 11:40+0000\n"
 "Last-Translator: Dina Solveig Jalkanen\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -19,62 +19,24 @@ msgstr ""
 "Language: fi_FI\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 "Väliaikainen postijakelu"
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr "Postijakelu"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Nimi"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Kuvaus"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Sähköpostiosoite"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Postipalvelin"
-
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Eräpäivä"
-
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -87,10 +49,20 @@ msgstr "Väliaikainen sähköpostin edelleenlähetys"
 msgid "Mail redirection"
 msgstr "Sähköpostin edelleenlähetys"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Nimi"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Nimeä edelleenlähetys"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Kuvaus"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Edelleenlähetyksen kuvaus"
@@ -111,40 +83,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Eräpäivä"
+
 #: 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"
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr "Väliaikainen postijakelu"
+
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
+msgstr "Postijakelu"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Sähköpostiosoite"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Postipalvelin"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
 msgstr ""
diff --git a/alias/locale/fr/fusiondirectory.po b/alias/locale/fr/fusiondirectory.po
index c50f526c7e..dbdc811dbe 100644
--- a/alias/locale/fr/fusiondirectory.po
+++ b/alias/locale/fr/fusiondirectory.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -21,63 +21,25 @@ msgstr ""
 "Language: fr\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 "Redistribution temporaire de courriel"
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr "Redistribution de courriel"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Nom"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr "Nom de l'alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Description"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr "Description de l'alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Adresse de courriel"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr "Alias de courriel"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
-msgstr "Alias pour cette adresse de courriel"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr "Configuration des alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Serveur de courriel"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr "Configuration du plugin alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr "Serveur de courriel pour cet alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "Alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Date d’expiration"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr "Branche des alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Date après laquelle cet alias doit être effacé. Laisser vide pour aucune expiration."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr "Branche dans laquelle les alias sont stockés"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -89,10 +51,20 @@ msgstr "Redirection temporaire de courriel"
 msgid "Mail redirection"
 msgstr "Redirection de courriel"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Nom"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Nom de la redirection de courriel"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Description"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Description de la redirection"
@@ -113,12 +85,60 @@ msgstr "Rediriger vers"
 msgid "Destination of this redirection"
 msgstr "Destination de la redirection"
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Date d’expiration"
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr "Date après laquelle cet alias doit être effacé. Laisser vide pour aucune expiration."
 
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr "Redistribution temporaire de courriel"
+
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
+msgstr "Redistribution de courriel"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
+msgstr "Nom de l'alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
+msgstr "Description de l'alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Adresse de courriel"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
+msgstr "Alias de courriel"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr "Alias pour cette adresse de courriel"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Serveur de courriel"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr "Serveur de courriel pour cet alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr "Date après laquelle cet alias doit être effacé. Laisser vide pour aucune expiration."
+
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
 msgstr "Alias"
@@ -130,23 +150,3 @@ msgstr "Gestion des alias"
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
 msgstr "Alias de courriel"
-
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
-msgstr "Configuration des alias"
-
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
-msgstr "Configuration du plugin alias"
-
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
-msgstr "Alias"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
-msgstr "Branche des alias"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
-msgstr "Branche dans laquelle les alias sont stockés"
diff --git a/alias/locale/hu_HU/fusiondirectory.po b/alias/locale/hu_HU/fusiondirectory.po
index 4d9ef8e38b..666f195f82 100644
--- a/alias/locale/hu_HU/fusiondirectory.po
+++ b/alias/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:30+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: hu_HU\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Név"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Leírás"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Név"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Leírás"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/id/fusiondirectory.po b/alias/locale/id/fusiondirectory.po
index 93cea28eb7..5b62d1015c 100644
--- a/alias/locale/id/fusiondirectory.po
+++ b/alias/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:30+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: id\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/it_IT/fusiondirectory.po b/alias/locale/it_IT/fusiondirectory.po
index 51d0aff6e6..6479316b4e 100644
--- a/alias/locale/it_IT/fusiondirectory.po
+++ b/alias/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:25+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,63 +19,25 @@ msgstr ""
 "Language: it_IT\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 "Distribuzione mail temporanea"
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr "Distribuzione mail"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Nome"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr "Nome per identificare questo alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Descrizione"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr "Descrizione di questo alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Indirizzo di posta elettronica"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr "Alias Email"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
-msgstr "Alias per questo indirizzo email"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr "Configurazione alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Server di posta elettronica"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr "Configurazione del plugin alias di FusionDirectory"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr "Server mail per questo alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "Alias dell'utente"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Data di scadenza"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr "RDN alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Data dopo la quale l'alias sarà cancellato. Lasciare vuoto per disabilitare la cancellazione."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr "Ramo nel quale gli alias saranno immagazzinati"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -87,10 +49,20 @@ msgstr "Redirezione mail temporanea"
 msgid "Mail redirection"
 msgstr "Redirezione mail"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Nome"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Nome per identificare questa redirezione"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Descrizione"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Descrizione di questa redirezione"
@@ -111,12 +83,60 @@ msgstr "Reindirizzare verso"
 msgid "Destination of this redirection"
 msgstr "Destinazione di questa redirezione"
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Data di scadenza"
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr "Data dopo la quale la redirezione sarà cancellata.Lasciare vuoto per non cancellare la redirezione."
 
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr "Distribuzione mail temporanea"
+
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
+msgstr "Distribuzione mail"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
+msgstr "Nome per identificare questo alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
+msgstr "Descrizione di questo alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Indirizzo di posta elettronica"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
+msgstr "Alias Email"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr "Alias per questo indirizzo email"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Server di posta elettronica"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr "Server mail per questo alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr "Data dopo la quale l'alias sarà cancellato. Lasciare vuoto per disabilitare la cancellazione."
+
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
 msgstr "Alias"
@@ -128,23 +148,3 @@ msgstr "Gestione degli alias"
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
 msgstr "Alias mail"
-
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
-msgstr "Configurazione alias"
-
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
-msgstr "Configurazione del plugin alias di FusionDirectory"
-
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
-msgstr "Alias dell'utente"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
-msgstr "RDN alias"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
-msgstr "Ramo nel quale gli alias saranno immagazzinati"
diff --git a/alias/locale/lv/fusiondirectory.po b/alias/locale/lv/fusiondirectory.po
index 135ec6bf79..4b7bd4322f 100644
--- a/alias/locale/lv/fusiondirectory.po
+++ b/alias/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/alias/class_mailAliasDistribution.inc:31
-#: admin/alias/class_mailAliasDistribution.inc:32
-#: admin/alias/class_mailAliasDistribution.inc:35
-msgid "Temporary mail distribution"
-msgstr "Pagaidu pasta sadale"
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr "Pasta sadale"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Vārds "
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Apraksts"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "E-pasta adrese"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Pasta serveris"
-
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Derīguma termiņš"
-
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr "Pagaidu pasta novirzīšana"
 msgid "Mail redirection"
 msgstr "Pasta novirzīšana"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Vārds "
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Nosaukums šīs novirzīšanas atpazīšanai"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Apraksts"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Novirzīšanas apraksts"
@@ -109,40 +81,68 @@ msgstr "Novirzīt uz"
 msgid "Destination of this redirection"
 msgstr "Šīs novirzīšanas saņēmējs"
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Derīguma termiņš"
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr "Datums, pēc kura novirzīšana jāizdzēš. Atstājite tukšu, ja nevēlaties izdzēst."
 
-#: admin/alias/class_aliasManagement.inc:33
-msgid "Aliases"
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr "Pagaidu pasta sadale"
+
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
+msgstr "Pasta sadale"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "E-pasta adrese"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Pasta serveris"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
 msgstr ""
diff --git a/alias/locale/nb/fusiondirectory.po b/alias/locale/nb/fusiondirectory.po
index 3406907703..264de20c20 100644
--- a/alias/locale/nb/fusiondirectory.po
+++ b/alias/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: nb\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Navn"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Navn"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Beskrivelse"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/nl/fusiondirectory.po b/alias/locale/nl/fusiondirectory.po
index 4d84a0d066..519c1ec31f 100644
--- a/alias/locale/nl/fusiondirectory.po
+++ b/alias/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -18,63 +18,25 @@ msgstr ""
 "Language: nl\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 "Tijdelijke mail distributielijst"
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr "Mail distributie"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Naam"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr "Naam om deze alias te identificeren"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Omschrijving"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr "Beschrijving van deze alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "E-mail adres"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr "Email aliases"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
-msgstr "Aliases voor dit email adres"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr "Alias configuratie"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr "FusdionDirectory alias plugin configuratie"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr "Mail server voor deze alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "Alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Vervaldatum"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr "Alias RDN"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Datum waarna de alias verwijderd zou moeten worden. Laat leeg indien de alias niet verwijderd moet worden."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr "Branch in welke de aliases zullen worden opgeslagen"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -86,10 +48,20 @@ msgstr "Tijdelijke mail redirectie"
 msgid "Mail redirection"
 msgstr "Mail redirectie"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Naam"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Naam om deze redirectie te identificeren"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Omschrijving"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Beschrijving van de redirectie"
@@ -110,12 +82,60 @@ msgstr "Doorsturen naar"
 msgid "Destination of this redirection"
 msgstr "Bestemming van deze omleiding"
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Vervaldatum"
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr "Datum waarna de omleiding verwijderd moet worden. Laat leeg voor niet te verwijderen."
 
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr "Tijdelijke mail distributielijst"
+
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
+msgstr "Mail distributie"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
+msgstr "Naam om deze alias te identificeren"
+
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
+msgstr "Beschrijving van deze alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "E-mail adres"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
+msgstr "Email aliases"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr "Aliases voor dit email adres"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Mail server"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr "Mail server voor deze alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr "Datum waarna de alias verwijderd zou moeten worden. Laat leeg indien de alias niet verwijderd moet worden."
+
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
 msgstr "Aliases"
@@ -127,23 +147,3 @@ msgstr "Alias beheer"
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
 msgstr "Email aliases"
-
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
-msgstr "Alias configuratie"
-
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
-msgstr "FusdionDirectory alias plugin configuratie"
-
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
-msgstr "Alias"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
-msgstr "Alias RDN"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
-msgstr "Branch in welke de aliases zullen worden opgeslagen"
diff --git a/alias/locale/pl/fusiondirectory.po b/alias/locale/pl/fusiondirectory.po
index 5e07b7206e..748c01ab9c 100644
--- a/alias/locale/pl/fusiondirectory.po
+++ b/alias/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Opis"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Adres email"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Serwer pocztowy"
-
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr ""
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "Alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "ImiÄ™"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Opis"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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 "Alias"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Adres email"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Serwer pocztowy"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
 msgstr "Alias"
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
 msgstr ""
diff --git a/alias/locale/pt/fusiondirectory.po b/alias/locale/pt/fusiondirectory.po
index 41bd3c6302..d5f1812918 100644
--- a/alias/locale/pt/fusiondirectory.po
+++ b/alias/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: pt\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Nome"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Descrição"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Nome"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Descrição"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/pt_BR/fusiondirectory.po b/alias/locale/pt_BR/fusiondirectory.po
index 89ac368be7..5e848cb4bc 100644
--- a/alias/locale/pt_BR/fusiondirectory.po
+++ b/alias/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,63 +17,25 @@ msgstr ""
 "Language: pt_BR\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 "Distribuição temporária de correio"
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr "Distribuição de correio"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Nome"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr "Nome para identificar este alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Descrição"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr "Descrição deste alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Endereço de email"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr "Aliases de email"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
-msgstr "Aliases deste endereço de email"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr "Configuração de alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "servidor de correio"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr "Configuração do plugin Allias do FusionDirectory"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr ""
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "Alias"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Data de expiração"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr "Allias RDN"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Data para que o alias seja eliminado. Deixe em branco para que não seja excluído."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr "Filial onde as Aliases são armazenados"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -85,10 +47,20 @@ msgstr "Redirecionamento temporário de correio"
 msgid "Mail redirection"
 msgstr "Redirecionamento de correio"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Nome"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Nome para identificar este redirecionamento"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Descrição"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Descrição deste redirecionamento"
@@ -109,12 +81,60 @@ msgstr "Redirecionar para"
 msgid "Destination of this redirection"
 msgstr "Destino deste redirecionamento"
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Data de expiração"
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr "Data para que o redirecionamento seja eliminado. Deixe em branco para que não seja excluído."
 
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr "Distribuição temporária de correio"
+
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
+msgstr "Distribuição de correio"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
+msgstr "Nome para identificar este alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
+msgstr "Descrição deste alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Endereço de email"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
+msgstr "Aliases de email"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr "Aliases deste endereço de email"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "servidor de correio"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr "Data para que o alias seja eliminado. Deixe em branco para que não seja excluído."
+
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
 msgstr "Aliases"
@@ -126,23 +146,3 @@ msgstr "Gerenciar alias"
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
 msgstr "Aliases de Correio"
-
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
-msgstr "Configuração de alias"
-
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
-msgstr "Configuração do plugin Allias do FusionDirectory"
-
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
-msgstr "Alias"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
-msgstr "Allias RDN"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
-msgstr "Filial onde as Aliases são armazenados"
diff --git a/alias/locale/ru/fusiondirectory.po b/alias/locale/ru/fusiondirectory.po
index e8969f0fd2..e15cee93e9 100644
--- a/alias/locale/ru/fusiondirectory.po
+++ b/alias/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -19,63 +19,25 @@ 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/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:53
-msgid "Mail distribution"
-msgstr "Распространение почты"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Название"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr "Имя определяющее этот псеводоним"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Описание"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr "Описание псеводонима"
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Адрес электронной почты"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr "Псевдонимы электронной почты"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
-msgstr "Псевдонимы для адреса электронной почты"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr "Настройка псеводонимов"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Почтовый сервер"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr "FusionDirectory настройка плагина псевдонимов."
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr "Почтовый сервер для этого псевдонима"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "Псеводоним"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Дата окончания действия"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr "RDN псевдонимов"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Дата после которой псевдоним будет удален. Оставить пустым, если удалять не нужно."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr "Ветка в которой будут храниться псеводонимы"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -87,10 +49,20 @@ msgstr "Временное перенаправление почты"
 msgid "Mail redirection"
 msgstr "Перенаправление почты"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Название"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Название определяющее это перенаправление"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Описание"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Описание этого перенаправления"
@@ -111,12 +83,60 @@ msgstr "Перенаправить куда"
 msgid "Destination of this redirection"
 msgstr "Адрес назначения для этого перенаправления"
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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_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:53
+msgid "Mail distribution"
+msgstr "Распространение почты"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
+msgstr "Имя определяющее этот псеводоним"
+
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
+msgstr "Описание псеводонима"
+
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Адрес электронной почты"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
+msgstr "Псевдонимы электронной почты"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr "Псевдонимы для адреса электронной почты"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Почтовый сервер"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr "Почтовый сервер для этого псевдонима"
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr "Дата после которой псевдоним будет удален. Оставить пустым, если удалять не нужно."
+
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
 msgstr "Псеводонимы"
@@ -128,23 +148,3 @@ 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 "FusionDirectory настройка плагина псевдонимов."
-
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
-msgstr "Псеводоним"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
-msgstr "RDN псевдонимов"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
-msgstr "Ветка в которой будут храниться псеводонимы"
diff --git a/alias/locale/ru@petr1708/fusiondirectory.po b/alias/locale/ru@petr1708/fusiondirectory.po
index 75a49227fe..c38a32a10e 100644
--- a/alias/locale/ru@petr1708/fusiondirectory.po
+++ b/alias/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:30+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,62 +17,24 @@ 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/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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/sv/fusiondirectory.po b/alias/locale/sv/fusiondirectory.po
index 7bd0039cfb..c19434dcfb 100644
--- a/alias/locale/sv/fusiondirectory.po
+++ b/alias/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,63 +17,25 @@ msgstr ""
 "Language: sv\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 "Temporär epostdistribution"
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr "Epost-distribution"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Namn"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr "Namn för att att identifiera detta alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Beskrivning"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr "Beskrivning av alias"
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "Epostadress"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr "Epostalias"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
-msgstr "Alias för denna epostadress"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr "Alias-konfigurering"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "Epostserver"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr "FusionDirectory alias-plugin-konfiguration"
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Utgångsdatum"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr "Alias RDN"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Datum efter vilket alias ska tas bort. Lämna tomt för att inte ta bort aliaset."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr "Gren där alias ska lagras"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -85,10 +47,20 @@ msgstr "Temporär omdirigering för epost"
 msgid "Mail redirection"
 msgstr "Epost-omdirigering"
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Namn"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Namn för att identifiera omdirigeringen"
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Beskrivning"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Beskrivning av omdirigeringen"
@@ -109,12 +81,60 @@ msgstr "Omdirigera till"
 msgid "Destination of this redirection"
 msgstr "Destination för omdirigeringen"
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Utgångsdatum"
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr "Datum då omdirigeringen ska tas bort. Lämna tomt för att inte ta bort."
 
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr "Temporär epostdistribution"
+
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
+msgstr "Epost-distribution"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
+msgstr "Namn för att att identifiera detta alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
+msgstr "Beskrivning av alias"
+
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "Epostadress"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
+msgstr "Epostalias"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr "Alias för denna epostadress"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "Epostserver"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr "Datum efter vilket alias ska tas bort. Lämna tomt för att inte ta bort aliaset."
+
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
 msgstr "Alias"
@@ -126,23 +146,3 @@ msgstr "Alias-hantering"
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
 msgstr "Epost-alias"
-
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
-msgstr "Alias-konfigurering"
-
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
-msgstr "FusionDirectory alias-plugin-konfiguration"
-
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
-msgstr ""
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
-msgstr "Alias RDN"
-
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
-msgstr "Gren där alias ska lagras"
diff --git a/alias/locale/ug/fusiondirectory.po b/alias/locale/ug/fusiondirectory.po
index 6036674227..301fd63079 100644
--- a/alias/locale/ug/fusiondirectory.po
+++ b/alias/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:30+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: ug\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/vi_VN/fusiondirectory.po b/alias/locale/vi_VN/fusiondirectory.po
index fd950f79c0..979906b1b5 100644
--- a/alias/locale/vi_VN/fusiondirectory.po
+++ b/alias/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: vi_VN\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Tên"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Mô tả"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Tên"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Mô tả"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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"
+#: 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_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias 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 ""
diff --git a/alias/locale/zh/fusiondirectory.po b/alias/locale/zh/fusiondirectory.po
index c7e2016bbd..1e314ea77d 100644
--- a/alias/locale/zh/fusiondirectory.po
+++ b/alias/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: zh\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:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "名称"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "描述"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "邮件地址"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "邮件服务器"
-
-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr ""
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "别名"
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""
 
-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""
 
 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "名称"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "描述"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""
 
+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+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_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""
 
-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "邮件地址"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "邮件服务器"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
 msgstr "别名"
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
 msgstr ""
 
-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
 msgstr ""
diff --git a/applications/locale/ar/fusiondirectory.po b/applications/locale/ar/fusiondirectory.po
index 58487e9fc6..948618d3c8 100644
--- a/applications/locale/ar/fusiondirectory.po
+++ b/applications/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "الكل"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "الكل"
diff --git a/applications/locale/ca/fusiondirectory.po b/applications/locale/ca/fusiondirectory.po
index b12b165fa6..409bbbda44 100644
--- a/applications/locale/ca/fusiondirectory.po
+++ b/applications/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/cs_CZ/fusiondirectory.po b/applications/locale/cs_CZ/fusiondirectory.po
index 028b560b8b..0e75e40100 100644
--- a/applications/locale/cs_CZ/fusiondirectory.po
+++ b/applications/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Aplikace"
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr "Nastavení zásuvného modulu Aplikace"
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr "Relativní rozlišený název aplikace"
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr "Větev, ve kterou budou uloženy aplikace"
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr "Relativní rozlišený název webové aplikace"
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr "Větev, ve které budou uloženy webové aplikace"
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr "Zobrazovat webové aplikace v nabídce"
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr "Zda v hlavní nabídce F.D. zobrazovat webové aplikace"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr "žádné"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr "Pouze povolené"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Vše"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Správa aplikací"
@@ -181,43 +221,3 @@ msgstr "Seznam aplikace"
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr "Aplikace, které mohou spouštět uživatelé s touto rolí"
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr "Nastavení zásuvného modulu Aplikace"
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr "Relativní rozlišený název aplikace"
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr "Větev, ve kterou budou uloženy aplikace"
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr "Relativní rozlišený název webové aplikace"
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr "Větev, ve které budou uloženy webové aplikace"
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr "Zobrazovat webové aplikace v nabídce"
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr "Zda v hlavní nabídce F.D. zobrazovat webové aplikace"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "žádné"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr "Pouze povolené"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Vše"
diff --git a/applications/locale/de/fusiondirectory.po b/applications/locale/de/fusiondirectory.po
index 82ad629a12..edecbfb03c 100644
--- a/applications/locale/de/fusiondirectory.po
+++ b/applications/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,14 +18,54 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Anwendungen"
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr "Anwendung RDN"
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr "Zweig in welchem Anwendungen gespeichert werden"
+
+#: 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 "Webanwendungen im Menü anzeigen"
+
+#: 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 "Keine"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr "Nur erlaubt"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Alle"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Anwendungsverwaltung"
@@ -182,43 +222,3 @@ msgstr "Anwendungsliste"
 #: 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 "Anwendung RDN"
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr "Zweig in welchem Anwendungen gespeichert werden"
-
-#: 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 "Webanwendungen im Menü anzeigen"
-
-#: 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 "Keine"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr "Nur erlaubt"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Alle"
diff --git a/applications/locale/el_GR/fusiondirectory.po b/applications/locale/el_GR/fusiondirectory.po
index 4506ff2bb4..cf430fb7f5 100644
--- a/applications/locale/el_GR/fusiondirectory.po
+++ b/applications/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,14 +18,54 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Εφαρμογές"
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr "Ρύθμιση προσθέτου εφαρμογών"
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr "RDN εφαρμογής"
+
+#: 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 "RDN εφαρμογών Web"
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr "Κλάδος όπου θα αποθηκεύονται οι εφαρμογές web"
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr "Εμφάνιση εφαρμογών web στο μενού "
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr "Αν θα εμφανίζονται οι εφαρμογές web στο κύριο μενού του FD"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr "Κανένα"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr "Επιτρέπεται μόνο"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Όλα"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Διαχείριση φαρμογών"
@@ -182,43 +222,3 @@ msgstr "Λίστα εφαρμογών"
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr "Οι εφαρμογές που θα  επιτρέπεται να εκκινούνται από χρήστες με αυτό τον ρόλο"
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr "Ρύθμιση προσθέτου εφαρμογών"
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr "RDN εφαρμογής"
-
-#: 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 "RDN εφαρμογών Web"
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr "Κλάδος όπου θα αποθηκεύονται οι εφαρμογές web"
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr "Εμφάνιση εφαρμογών web στο μενού "
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr "Αν θα εμφανίζονται οι εφαρμογές web στο κύριο μενού του FD"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Κανένα"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr "Επιτρέπεται μόνο"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Όλα"
diff --git a/applications/locale/es/fusiondirectory.po b/applications/locale/es/fusiondirectory.po
index 795ff8dd80..5cd0670a67 100644
--- a/applications/locale/es/fusiondirectory.po
+++ b/applications/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Aplicaciones"
 
+#: 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 "Ninguno"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Todo"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Administración de aplicación"
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Ninguno"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Todo"
diff --git a/applications/locale/es_CO/fusiondirectory.po b/applications/locale/es_CO/fusiondirectory.po
index 8016eeb3d2..79910fb44a 100644
--- a/applications/locale/es_CO/fusiondirectory.po
+++ b/applications/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr "Ninguno"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Ninguno"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/es_VE/fusiondirectory.po b/applications/locale/es_VE/fusiondirectory.po
index 214f2315c1..6bd5bb355f 100644
--- a/applications/locale/es_VE/fusiondirectory.po
+++ b/applications/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Aplicaciones"
 
+#: 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 "Ninguno"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Todo"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Administración de aplicación"
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Ninguno"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Todo"
diff --git a/applications/locale/fa_IR/fusiondirectory.po b/applications/locale/fa_IR/fusiondirectory.po
index d41d60fb6a..fa65e62e51 100644
--- a/applications/locale/fa_IR/fusiondirectory.po
+++ b/applications/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/fi_FI/fusiondirectory.po b/applications/locale/fi_FI/fusiondirectory.po
index 783d9a054b..da40b22d8d 100644
--- a/applications/locale/fi_FI/fusiondirectory.po
+++ b/applications/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Sovellukset"
 
+#: 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 "Kaikki"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Sovellusten hallinta"
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Kaikki"
diff --git a/applications/locale/fr/fusiondirectory.po b/applications/locale/fr/fusiondirectory.po
index 567aeb1cea..88a7e90e12 100644
--- a/applications/locale/fr/fusiondirectory.po
+++ b/applications/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -19,14 +19,54 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Applications"
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr "Configuration du plugin applications"
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr "Branche des applications"
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr "Branche dans laquelle les applications seront stockées"
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr "Branche des applications web"
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr "Branche dans laquelle les applications web seront stockées"
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr "Afficher les applications web dans le menu"
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr "S’il faut afficher les applications web dans le menu principal de FD"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr "Aucunes"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr "Selon autorisation"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Toutes"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Gestion des applications"
@@ -183,43 +223,3 @@ msgstr "List d’applications"
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr "Les applications que les utilisateurs avec ce rôle sont autorisés à exécuter"
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr "Configuration du plugin applications"
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr "Branche des applications"
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr "Branche dans laquelle les applications seront stockées"
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr "Branche des applications web"
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr "Branche dans laquelle les applications web seront stockées"
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr "Afficher les applications web dans le menu"
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr "S’il faut afficher les applications web dans le menu principal de FD"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Aucunes"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr "Selon autorisation"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Toutes"
diff --git a/applications/locale/hu_HU/fusiondirectory.po b/applications/locale/hu_HU/fusiondirectory.po
index ec249ce6f7..b3d4314aba 100644
--- a/applications/locale/hu_HU/fusiondirectory.po
+++ b/applications/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/id/fusiondirectory.po b/applications/locale/id/fusiondirectory.po
index 9e5374cbed..f0616ccb3b 100644
--- a/applications/locale/id/fusiondirectory.po
+++ b/applications/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/it_IT/fusiondirectory.po b/applications/locale/it_IT/fusiondirectory.po
index 87e4d94d4b..6d0b71c0ac 100644
--- a/applications/locale/it_IT/fusiondirectory.po
+++ b/applications/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,14 +19,54 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Applicazioni"
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr "Configurazione del plugin delle applicazioni"
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr "Applicazione RDN"
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr "Ramo nel quale le applicazioni verranno immagazzinate"
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr "Applicazioni Web RDN"
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr "Ramo nel quale le applicazioni verranno immagazzinate "
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr "Mostra le applicazioni Web nel menu"
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr "Sia per mostrare le applicazioni Web nel menu FD"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr "Nessuno"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr "Solo autorizzati"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Tutto"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Gestione dell'applicazione"
@@ -183,43 +223,3 @@ msgstr "Lista delle applicazioni"
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr "Applicazioni consentite per questo ruolo"
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr "Configurazione del plugin delle applicazioni"
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr "Applicazione RDN"
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr "Ramo nel quale le applicazioni verranno immagazzinate"
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr "Applicazioni Web RDN"
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr "Ramo nel quale le applicazioni verranno immagazzinate "
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr "Mostra le applicazioni Web nel menu"
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr "Sia per mostrare le applicazioni Web nel menu FD"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Nessuno"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr "Solo autorizzati"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Tutto"
diff --git a/applications/locale/lv/fusiondirectory.po b/applications/locale/lv/fusiondirectory.po
index c4a8e2a191..ebf45ebe76 100644
--- a/applications/locale/lv/fusiondirectory.po
+++ b/applications/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Visi "
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Visi "
diff --git a/applications/locale/nb/fusiondirectory.po b/applications/locale/nb/fusiondirectory.po
index 0391a16265..c3df349c85 100644
--- a/applications/locale/nb/fusiondirectory.po
+++ b/applications/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/nl/fusiondirectory.po b/applications/locale/nl/fusiondirectory.po
index 3fb8cae712..2a6aebf243 100644
--- a/applications/locale/nl/fusiondirectory.po
+++ b/applications/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Programma's"
 
+#: 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 "Geen"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Alle"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Programma beheer"
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Geen"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Alle"
diff --git a/applications/locale/pl/fusiondirectory.po b/applications/locale/pl/fusiondirectory.po
index 261818cdd1..fceef13e69 100644
--- a/applications/locale/pl/fusiondirectory.po
+++ b/applications/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Aplikacje"
 
+#: 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 "Wszystkie"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "ZarzÄ…dzanie aplikacjÄ…"
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Wszystkie"
diff --git a/applications/locale/pt/fusiondirectory.po b/applications/locale/pt/fusiondirectory.po
index 92a5683eb4..b43dbaf683 100644
--- a/applications/locale/pt/fusiondirectory.po
+++ b/applications/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Aplicações"
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/pt_BR/fusiondirectory.po b/applications/locale/pt_BR/fusiondirectory.po
index 97fab0f0b3..ad18362b65 100644
--- a/applications/locale/pt_BR/fusiondirectory.po
+++ b/applications/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Aplicações"
 
+#: 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 "Nenhum"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Todos"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Nenhum"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Todos"
diff --git a/applications/locale/ru/fusiondirectory.po b/applications/locale/ru/fusiondirectory.po
index 8c2e0337bb..d80653d71b 100644
--- a/applications/locale/ru/fusiondirectory.po
+++ b/applications/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Приложения"
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "Все"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Управление приложениями"
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Все"
diff --git a/applications/locale/ru@petr1708/fusiondirectory.po b/applications/locale/ru@petr1708/fusiondirectory.po
index 6d8f65b34c..5f9ed62cca 100644
--- a/applications/locale/ru@petr1708/fusiondirectory.po
+++ b/applications/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/sv/fusiondirectory.po b/applications/locale/sv/fusiondirectory.po
index 105bb72a98..0aa195ccc6 100644
--- a/applications/locale/sv/fusiondirectory.po
+++ b/applications/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Applikationer"
 
+#: 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 "Ingen"
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Ingen"
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/ug/fusiondirectory.po b/applications/locale/ug/fusiondirectory.po
index f195ba42a6..3abdc8e498 100644
--- a/applications/locale/ug/fusiondirectory.po
+++ b/applications/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr ""
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/vi_VN/fusiondirectory.po b/applications/locale/vi_VN/fusiondirectory.po
index 204c688294..02632bfd6a 100644
--- a/applications/locale/vi_VN/fusiondirectory.po
+++ b/applications/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "Các ứng dụng"
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr ""
diff --git a/applications/locale/zh/fusiondirectory.po b/applications/locale/zh/fusiondirectory.po
index 44131d07d2..c78624540b 100644
--- a/applications/locale/zh/fusiondirectory.po
+++ b/applications/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,14 +17,54 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
-#: config/applications/class_applicationsPluginConfig.inc:28
-#: config/applications/class_applicationsPluginConfig.inc:40
 msgid "Applications"
 msgstr "应用程序"
 
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr "全部"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "应用程序管理"
@@ -181,43 +221,3 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
 msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "全部"
diff --git a/argonaut/locale/ar/fusiondirectory.po b/argonaut/locale/ar/fusiondirectory.po
index b8f8b6ba7f..f7c1d7ce89 100644
--- a/argonaut/locale/ar/fusiondirectory.po
+++ b/argonaut/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "إزالة"
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "خطأ"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "إعادة تشغيل"
+
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr ""
+
+#: 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_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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "خدمات"
-
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "خدمات"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -411,326 +498,240 @@ msgid "Allow notify"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
-msgid "Allow update (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "إعادة تشغيل"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "خطأ"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "إزالة"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/ca/fusiondirectory.po b/argonaut/locale/ca/fusiondirectory.po
index 8c34b7fd31..fb2c694759 100644
--- a/argonaut/locale/ca/fusiondirectory.po
+++ b/argonaut/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Error"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Servidor intermediari"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+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_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:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Continguts"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -411,326 +498,240 @@ msgid "Allow notify"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
-msgid "Allow update (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Error"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Servidor intermediari"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Continguts"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/cs_CZ/fusiondirectory.po b/argonaut/locale/cs_CZ/fusiondirectory.po
index 1b472ed2de..9b672b1e97 100644
--- a/argonaut/locale/cs_CZ/fusiondirectory.po
+++ b/argonaut/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,342 +17,412 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
-msgstr "Argonaut klient"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr "Nalezeno více argonaut serverů. Použit je možné ale pouze jeden"
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
-msgstr "Upravit nastavení argonaut klienta"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
+msgstr "Není nastaven žádný argonaut server"
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
-msgstr "Nastavení Argonaut klienta"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
+msgstr "Nelze načíst %s!"
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
-msgstr "Port klienta"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
+msgstr "%s není soubor!"
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
-msgstr "Port používaný argonaut klientem JSON-RPC komunikaci"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
+msgstr "Fronta nasazení"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
-msgstr "Protokol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Poskytuje mechanizmus pro samočinnou aktivaci systémů"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
-msgstr "Protokol, který má být používán službou argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Oprávnění"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
-msgstr "Rozhraní pro probouzení po síti (WoL)"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Odstranit"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
-msgstr "Rozhraní použité komponentou argonaut pro probouzení strojů po síti (WoL)"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr "Tyto úlohy nemohly být smazány, protože musí být nejprve přerušeny: %s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
-msgstr "TaskId soubor"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
+msgstr "Informace"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
-msgstr "Soubor, který bude argonaut používat pro ukládání identifikátorů svých úloh při zavádění systému"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
+msgstr "%s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
-msgstr "Složka pro soubory se záznamy událostí"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
+msgstr "Podrobnosti chyby"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
-msgstr "Složka, do které by argonaut klient měl ukládat své soubory se záznamem událostí"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Chyba"
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
-msgstr "Umístění SSL"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "Nelze aktualizovat položky fronty."
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
-msgstr "Klíč"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
+msgstr "okamžitě"
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
-msgstr "Umístění souboru se soukromou částí klíče na Argonaut klientovi"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
+msgstr "Čekající"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
-msgstr "Certifikát"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
+msgstr "Zobrazit chybu"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
-msgstr "Umístění souboru s certifikátem na Argonaut klientovi"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
+msgstr "Zpracované"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
-msgstr "Certifikát cert. autority"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
+msgstr "probíhá"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
-msgstr "Umístění souboru s certifikátem cert. autority na Argonaut klientovi"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Vypnout"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
-msgstr "CN certifikátu"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Restartovat"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
-msgstr "CN v tomto klientském certifikátu"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "zapnout na dálku"
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
-msgstr "Názvy služeb"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
+msgstr "Aktualizace programového vybavení"
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
-msgstr "Názvy služby Argonaut"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
+msgstr "(Pře)Instalovat"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr "Hodiny"
+
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr "minuty"
+
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
-msgstr "Nastavení Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "Datum"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
-msgstr "Základní nastavení"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr "ÄŒas"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
-msgstr "Výchozí režim"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
-msgstr "Složka, ve které bude argonaut-fuse ukládat svůj protokol"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
-msgstr "TFTP"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
+msgstr "Plán"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
-msgstr "Umístění souborů s nastaveními pro PXELINUX"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
+msgstr "Opakovaná úloha"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
-msgstr "Umístění, ve kterém by měl argonaut-fuse ukládat pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
-msgstr "Nastavení zrcadla Argonaut"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
-msgstr "Nastavení zrcadla Argonautu"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr "dny"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr "Složka místního repozitáře distribuce Debian"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr "týdny"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
-msgstr "Nastavení pro Argonaut Debconf Crawler"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr "měsíce"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
-msgstr "Složka s místními balíčky"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr "Období"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
-msgstr "Složka, ve které clrawler bude ukládat balíčky v průběhu analýzy"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
-msgstr "Nastavení repozitáře Argonaut"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Seznam úloh ve frontě"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
-msgstr "Určuje http proxy (jako např. Squid), kterou použít pro metodu http a ftp"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr "Událost"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr "Složka pro ukládání záznamů protokolu"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr "Cíl"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr "Nevšímat si chyb"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Úkol"
 
-#: 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 "Způsobí, že si debmirror nebude všímat chybějících či poškozených .deb a souborů se zdrojovými kódy. Ale stále bude velmi důsledný ohledně kontrolování meta souborů"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Stav"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Zdroj"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Akce"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr "Zahrnout v zrcadlu zdrojové kódy"
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr "Import"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
-msgstr "Kontrola GPG"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Přerušit"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr "V případě, že chybí soubor Release.gpg vyhlásit neúspěch"
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Spustit"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Obsah"
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
+msgstr "Zpracovat nyní"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr "Dále stáhnout soubory Contents.<arch>.gz (Poznamenejme, že tyto soubory mohou být poměrně veliké a často se mění)"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr "Zobrazit protokoly"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
-msgstr "Poskytovat podrobnější informace"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
-msgstr "Zda zapnout výřečnější režim"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
-msgstr "Nastavení Fuse FAI modulu pro Argonaut"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Služby"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Nahrát"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Příznaky FAI"
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
-msgstr "kořen struktury složek, nacházející se na síťovém souborovém systému (NFS)"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
+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 "Argonaut server"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
-msgstr "Smazat již dokončené úlohy"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr "Služba Infrastruktura"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
-msgstr "Zda argonaut server má mazat úlohy po jejich úspěšném dokončení"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr "Import byl dokončen: %s událostí úspěšně zasláno, %s se nezdařilo"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
-msgstr "Získat informace o balíčcích"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "soubor je prázdný"
 
-#: 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 "Zda má argonaut server na začátku získat informace z repozitářů a pak jednou denně obnovovat. Je třeba pro vytváření seznamu FAI balíčků."
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr "MAC adresa"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Port"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr "Nedaří se načíst položky fronty: %s"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
-msgstr "Port, na kterém bude argonaut server očekávat spojení"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr "Argonaut klient"
+
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr "Upravit nastavení argonaut klienta"
+
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr "Nastavení Argonaut klienta"
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr "Port klienta"
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
+msgstr "Port používaný argonaut klientem JSON-RPC komunikaci"
+
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr "Protokol"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "Časový limit"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
+msgstr "Protokol, který má být používán službou argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
-msgstr "Doba (v sekundách) po jejímž uplynutí bude argonaut klient či server považován za nedostupný"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
+msgstr "Rozhraní pro probouzení po síti (WoL)"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
-msgstr "Složka, ve které bude argonaut ukládat svůj protokol"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
+msgstr "Rozhraní použité komponentou argonaut pro probouzení strojů po síti (WoL)"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
-msgstr "Probuzení po síti (WoL)"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
+msgstr "TaskId soubor"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
-msgstr "Rozhraní"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr "Soubor, který bude argonaut používat pro ukládání identifikátorů svých úloh při zavádění systému"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
-msgstr "Síťové rozhraní přes které posílat požadavky na probuzení počítačů (WoL)"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
+msgstr "Složka pro soubory se záznamy událostí"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
-msgstr "nástroj pro IP"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
+msgstr "Složka, do které by argonaut klient měl ukládat své soubory se záznamem událostí"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
-msgstr "Který IP nástroj použít"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
+msgstr "Umístění SSL"
 
+#: admin/systems/argonaut/class_argonautClient.inc:164
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
-msgstr "Umístění souboru se soukromou částí klíče na Argonaut serveru"
+msgid "Key"
+msgstr "Klíč"
+
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
+msgstr "Umístění souboru se soukromou částí klíče na Argonaut klientovi"
 
+#: admin/systems/argonaut/class_argonautClient.inc:169
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
-msgstr "Umístění souboru s certifikátem na Argonaut serveru"
+msgid "Certificate"
+msgstr "Certifikát"
+
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
+msgstr "Umístění souboru s certifikátem na Argonaut klientovi"
 
+#: admin/systems/argonaut/class_argonautClient.inc:174
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
-msgstr "Umístění certifikátu cert. autority na Argonaut serveru"
+msgid "CA certificate"
+msgstr "Certifikát cert. autority"
+
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
+msgstr "Umístění souboru s certifikátem cert. autority na Argonaut klientovi"
 
+#: admin/systems/argonaut/class_argonautClient.inc:179
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
-msgstr "CN tohoto serverového certifikátu"
+msgid "CN of the certificate"
+msgstr "CN certifikátu"
+
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
+msgstr "CN v tomto klientském certifikátu"
+
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
+msgstr "Názvy služeb"
+
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
+msgstr "Názvy služby Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Služby"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr "OPSI"
@@ -373,6 +443,23 @@ 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
+msgid "Argonaut Fuse FAI module settings"
+msgstr "Nastavení Fuse FAI modulu pro Argonaut"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr "Příznaky FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr "kořen struktury složek, nacházející se na síťovém souborovém systému (NFS)"
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -447,291 +534,205 @@ msgstr "LTSP"
 msgid "LTSP server"
 msgstr "Linuxový terminálový server (LTSP)"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Vypnout"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Restartovat"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "zapnout na dálku"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr "Aktualizace programového vybavení"
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr "(Pře)Instalovat"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Chyba"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-msgstr "Nedaří se načíst položky fronty: %s"
-
-#: 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 "Nahrát"
-
-#: 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:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Import"
-
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
-msgstr "Služba Infrastruktura"
-
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
-msgstr "Import byl dokončen: %s událostí úspěšně zasláno, %s se nezdařilo"
-
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "soubor je prázdný"
-
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
-msgstr "MAC adresa"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
+msgstr "Nastavení Argonaut Fuse"
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
-msgstr "Událost"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
+msgstr "Základní nastavení"
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
-msgstr "Fronta nasazení"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr "Výchozí režim"
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Poskytuje mechanizmus pro samočinnou aktivaci systémů"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr "Složka, ve které bude argonaut-fuse ukládat svůj protokol"
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Oprávnění"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr "TFTP"
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Odstranit"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr "Umístění souborů s nastaveními pro PXELINUX"
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Tyto úlohy nemohly být smazány, protože musí být nejprve přerušeny: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
+msgstr "Umístění, ve kterém by měl argonaut-fuse ukládat pxelinux.cfg"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
-msgstr "Informace"
+#: 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 "Argonaut server"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
-msgstr "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr "Smazat již dokončené úlohy"
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
-msgstr "Podrobnosti chyby"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
+msgstr "Zda argonaut server má mazat úlohy po jejich úspěšném dokončení"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "Nelze aktualizovat položky fronty."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
+msgstr "Získat informace o balíčcích"
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
-msgstr "okamžitě"
+#: 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 "Zda má argonaut server na začátku získat informace z repozitářů a pak jednou denně obnovovat. Je třeba pro vytváření seznamu FAI balíčků."
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
-msgstr "Čekající"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Port"
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
-msgstr "Zobrazit chybu"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr "Port, na kterém bude argonaut server očekávat spojení"
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
-msgstr "Zpracované"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "Časový limit"
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
-msgstr "probíhá"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr "Doba (v sekundách) po jejímž uplynutí bude argonaut klient či server považován za nedostupný"
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
-msgstr "Seznam úloh ve frontě"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr "Složka, ve které bude argonaut ukládat svůj protokol"
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
-msgstr "Cíl"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr "Probuzení po síti (WoL)"
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Úkol"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr "Rozhraní"
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
-msgstr "Období"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr "Síťové rozhraní přes které posílat požadavky na probuzení počítačů (WoL)"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
-msgstr "Plán"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr "nástroj pro IP"
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Stav"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr "Který IP nástroj použít"
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Akce"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr "Umístění souboru se soukromou částí klíče na Argonaut serveru"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Přerušit"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
+msgstr "Umístění souboru s certifikátem na Argonaut serveru"
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Spustit"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
+msgstr "Umístění certifikátu cert. autority na Argonaut serveru"
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
-msgstr "Zpracovat nyní"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
+msgstr "CN tohoto serverového certifikátu"
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
-msgstr "Zobrazit protokoly"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr "Nastavení zrcadla Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
-msgstr "Hodiny"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr "Nastavení zrcadla Argonautu"
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
-msgstr "minuty"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
+msgstr "Složka místního repozitáře distribuce Debian"
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr "Nastavení pro Argonaut Debconf Crawler"
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Datum"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr "Složka s místními balíčky"
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
-msgstr "ÄŒas"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
+msgstr "Složka, ve které clrawler bude ukládat balíčky v průběhu analýzy"
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
+msgstr "Nastavení repozitáře Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
-msgstr "Opakovaná úloha"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+msgstr "Určuje http proxy (jako např. Squid), kterou použít pro metodu http a ftp"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
+msgstr "Složka pro ukládání záznamů protokolu"
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr "Nevšímat si chyb"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
-msgstr "dny"
+#: 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 "Způsobí, že si debmirror nebude všímat chybějících či poškozených .deb a souborů se zdrojovými kódy. Ale stále bude velmi důsledný ohledně kontrolování meta souborů"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
-msgstr "týdny"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr "Zdroj"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
-msgstr "měsíce"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
+msgstr "Zahrnout v zrcadlu zdrojové kódy"
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr "Kontrola GPG"
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
+msgstr "V případě, že chybí soubor Release.gpg vyhlásit neúspěch"
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
-msgstr "Nalezeno více argonaut serverů. Použit je možné ale pouze jeden"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Obsah"
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
-msgstr "Není nastaven žádný argonaut server"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
+msgstr "Dále stáhnout soubory Contents.<arch>.gz (Poznamenejme, že tyto soubory mohou být poměrně veliké a často se mění)"
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
-msgstr "Nelze načíst %s!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
+msgstr "Poskytovat podrobnější informace"
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
-msgstr "%s není soubor!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
+msgstr "Zda zapnout výřečnější režim"
 
 #: addons/argonaut/import_events.tpl.c:2
 msgid ""
diff --git a/argonaut/locale/de/fusiondirectory.po b/argonaut/locale/de/fusiondirectory.po
index efc6c274af..55907a7fc7 100644
--- a/argonaut/locale/de/fusiondirectory.po
+++ b/argonaut/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,342 +17,412 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
-msgstr "Argonaut Client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr "Mehrere argonaut Server gefunden. Nur einer wird unterstützt"
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
-msgstr "Argonaut Clienteinstellungen bearbeiten"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
+msgstr "Es ist kein argonaut-Server konfiguriert"
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
-msgstr "Argonaut Clienteinstellungen"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
+msgstr "\"%s\" konnte nicht gelesen werden!"
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
-msgstr "Clientport"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
+msgstr "\"%s\" ist keine Datei!"
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
-msgstr "Port, der vom argonaut-client für JSON-RPC verwendet wird"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
+msgstr "Deployment-Warteschlange"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
-msgstr "Protokoll"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Stelle einen Mechanismus bereit um Systemen automatisch zu aktivieren"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
-msgstr "Zu verwendendes Protokoll für argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Berechtigung"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
-msgstr "WakeOnLan Schnittstelle"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Entfernen"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
-msgstr "Schnittstelle, die von argonaut für WakeOnLan verwendet wird"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr "Die folgenden Aufträge konnten nicht gelöscht werden, sie müssen abgebrochen werden: %s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
-msgstr "TaskId Datei"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
+msgstr "Info"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
-msgstr "Datei, die argonaut verwenden wird um seine Task ID während des Bootens zu speichern"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
+msgstr "%s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
-msgstr "Log Verzeichnis"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
+msgstr "Fehlerdetail"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
-msgstr "Verzeichnis in dem argonaut-Client seine Logs schreiben soll"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Fehler"
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
-msgstr "SSL-Pfade"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "Kann Warteschlangeneinträge nicht aktualisieren."
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
-msgstr "Schlüssel"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
+msgstr "sofort"
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
-msgstr "Pfad zum privaten Schlüssel auf dem Argonaut-Client"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
+msgstr "Wartend"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
-msgstr "Zertifikat"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
+msgstr "Fehler anzeigen"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
-msgstr "Pfad zur Zertifikatsdatei auf dem Argonaut-Client"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
+msgstr "Durchgeführt"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
-msgstr "CA-Zertifikat"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
+msgstr "in Bearbeitung"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
-msgstr "Pfad zur CA-Zertifikatsdatei auf dem Argonaut-Client"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Ausschalten"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
-msgstr "CN des Zertifikats"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Neustarten"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
-msgstr "Der CN in diesem Client-Zertifikat"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "Aufwecken"
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
-msgstr "Dienstnamen"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
+msgstr "Softwareupdate"
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
-msgstr "Argonaut Dienstnamen"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
+msgstr "(Re)Installieren"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr "Stunden"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
-msgstr "Argonaut Fuse Einstellungen"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr "Minuten"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
-msgstr "Grundlegende Einstellungen"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
-msgstr "Standardmodus"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "Datum"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
-msgstr "Verzeichnis in dem argonaut-fuse sein Log speichern wird"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr "Zeit"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
-msgstr "TFTP"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
-msgstr "Pxelinux cfg Pfad"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
-msgstr "Pfad wo argonaut-fuse pxelinux.cfg speichern soll"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
+msgstr "Plan"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
-msgstr "Argonaut Mirror-Einstellungen"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
+msgstr "Periodischer Auftrag"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
-msgstr "Argonaut Mirror-Einstellungen"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr "Lokales Debian-Spiegelserververzeichnis"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
-msgstr "Argonaut Debconf Crawler Konfiguration"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr "Tage"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
-msgstr "Lokale Paketeordner"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr "Wochen"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
-msgstr "Ordner in dem der Crawler Paket während der Analyse speichern wird"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr "Monate"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
-msgstr "Argonaut Repository Konfiguration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr "Intervall"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr "Verzeichnis, in dem Protokolle gespeichert werden sollen"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Liste der geplanten Vorgänge"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr "Fehler ignorieren"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr "Ereignis"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr "Ziel"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Quelle"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Vorgang"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr "Quelle im Spiegelserver einbeziehen"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Status"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
-msgstr "GPG Check"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Aktionen"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr "Importieren"
+
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Abbrechen"
+
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Ausführen"
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
+msgstr "Jetzt durchführen"
+
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr "Protokolle einsehen"
+
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Inhalt"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
-msgstr "Ausführlich"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
-msgstr "Ob der verbose-Modus aktiviert werden soll"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Hochladen"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
-msgstr "Argonaut Fuse FAI Moduleinstellungen"
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Dienste"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Fai Flags"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr "Infrastrukturdienst"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
-msgstr "NFS root"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr "Import abgeschlossen: %s Vorgänge importiert, %s fehlgeschlagen"
 
-#: 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 "Argonaut Server"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "Die Datei ist leer"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
-msgstr "Beendete Aufgaben löschen"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr "MAC"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
-msgstr "Ob der argonaut-Server erfolgreich abgeschlossene Aufgaben löschen soll"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr "Kann Warteschlangeneinträge nicht laden: %s"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
-msgstr "Paketinformationen holen"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr "Argonaut Client"
 
-#: 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/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr "Argonaut Clienteinstellungen bearbeiten"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Anschluss"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr "Argonaut Clienteinstellungen"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
-msgstr "Port auf dem der argonaut-Server lauschen wird"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr "Clientport"
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
+msgstr "Port, der vom argonaut-client für JSON-RPC verwendet wird"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "Wartezeit"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr "Protokoll"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
-msgstr "Zeit in Sekunden bevor ein argonaut-Client oder Server als down bezeichnet werden soll"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
+msgstr "Zu verwendendes Protokoll für argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
-msgstr "Verzeichnis in dem argonaut sein Log speichern wird"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
+msgstr "WakeOnLan Schnittstelle"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
-msgstr "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
+msgstr "Schnittstelle, die von argonaut für WakeOnLan verwendet wird"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
-msgstr "Schnittstelle"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
+msgstr "TaskId Datei"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
-msgstr "Zu verwendende Schnittstelle für den Versand von WakeOnLan-Anfragen"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr "Datei, die argonaut verwenden wird um seine Task ID während des Bootens zu speichern"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
-msgstr "IP Werkzeug"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
+msgstr "Log Verzeichnis"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
-msgstr "Zu verwendendes IP-Werkzeug"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
+msgstr "Verzeichnis in dem argonaut-Client seine Logs schreiben soll"
+
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
+msgstr "SSL-Pfade"
 
+#: admin/systems/argonaut/class_argonautClient.inc:164
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
-msgstr "Pfad zum privaten Schlüssel auf dem Argonaut-Server"
+msgid "Key"
+msgstr "Schlüssel"
+
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
+msgstr "Pfad zum privaten Schlüssel auf dem Argonaut-Client"
 
+#: admin/systems/argonaut/class_argonautClient.inc:169
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
-msgstr "Pfad zur Zertifikatsdatei auf dem Argonaut-Server"
+msgid "Certificate"
+msgstr "Zertifikat"
+
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
+msgstr "Pfad zur Zertifikatsdatei auf dem Argonaut-Client"
 
+#: admin/systems/argonaut/class_argonautClient.inc:174
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
-msgstr "Pfad zur CA-Zertifikatsdatei auf dem Argonaut-Server"
+msgid "CA certificate"
+msgstr "CA-Zertifikat"
+
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
+msgstr "Pfad zur CA-Zertifikatsdatei auf dem Argonaut-Client"
 
+#: admin/systems/argonaut/class_argonautClient.inc:179
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
-msgstr "Der CN im Serverzertifikat"
+msgid "CN of the certificate"
+msgstr "CN des Zertifikats"
+
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
+msgstr "Der CN in diesem Client-Zertifikat"
+
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
+msgstr "Dienstnamen"
+
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
+msgstr "Argonaut Dienstnamen"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Dienste"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr "OPSI"
@@ -373,6 +443,23 @@ 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
+msgid "Argonaut Fuse FAI module settings"
+msgstr "Argonaut Fuse FAI Moduleinstellungen"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr "Fai Flags"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr "NFS root"
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -447,291 +534,205 @@ msgstr "LTSP"
 msgid "LTSP server"
 msgstr "LTSP Server"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Ausschalten"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Neustarten"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "Aufwecken"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr "Softwareupdate"
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr "(Re)Installieren"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Fehler"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-msgstr "Kann Warteschlangeneinträge nicht laden: %s"
-
-#: 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 "Hochladen"
-
-#: 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:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Importieren"
-
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
-msgstr "Infrastrukturdienst"
-
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
-msgstr "Import abgeschlossen: %s Vorgänge importiert, %s fehlgeschlagen"
-
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "Die Datei ist leer"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
+msgstr "Argonaut Fuse Einstellungen"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
-msgstr "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
+msgstr "Grundlegende Einstellungen"
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
-msgstr "Ereignis"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr "Standardmodus"
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
-msgstr "Deployment-Warteschlange"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr "Verzeichnis in dem argonaut-fuse sein Log speichern wird"
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Stelle einen Mechanismus bereit um Systemen automatisch zu aktivieren"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr "TFTP"
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Berechtigung"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr "Pxelinux cfg Pfad"
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Entfernen"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
+msgstr "Pfad wo argonaut-fuse pxelinux.cfg speichern soll"
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Die folgenden Aufträge konnten nicht gelöscht werden, sie müssen abgebrochen werden: %s"
+#: 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 "Argonaut Server"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
-msgstr "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr "Beendete Aufgaben löschen"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
-msgstr "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
+msgstr "Ob der argonaut-Server erfolgreich abgeschlossene Aufgaben löschen soll"
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
-msgstr "Fehlerdetail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
+msgstr "Paketinformationen holen"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "Kann Warteschlangeneinträge nicht aktualisieren."
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
-msgstr "sofort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Anschluss"
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
-msgstr "Wartend"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr "Port auf dem der argonaut-Server lauschen wird"
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
-msgstr "Fehler anzeigen"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "Wartezeit"
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
-msgstr "Durchgeführt"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr "Zeit in Sekunden bevor ein argonaut-Client oder Server als down bezeichnet werden soll"
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
-msgstr "in Bearbeitung"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr "Verzeichnis in dem argonaut sein Log speichern wird"
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
-msgstr "Liste der geplanten Vorgänge"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr "Wake on lan"
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
-msgstr "Ziel"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr "Schnittstelle"
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Vorgang"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr "Zu verwendende Schnittstelle für den Versand von WakeOnLan-Anfragen"
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
-msgstr "Intervall"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr "IP Werkzeug"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
-msgstr "Plan"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr "Zu verwendendes IP-Werkzeug"
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr "Pfad zum privaten Schlüssel auf dem Argonaut-Server"
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Aktionen"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
+msgstr "Pfad zur Zertifikatsdatei auf dem Argonaut-Server"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Abbrechen"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
+msgstr "Pfad zur CA-Zertifikatsdatei auf dem Argonaut-Server"
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Ausführen"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
+msgstr "Der CN im Serverzertifikat"
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
-msgstr "Jetzt durchführen"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr "Argonaut Mirror-Einstellungen"
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
-msgstr "Protokolle einsehen"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr "Argonaut Mirror-Einstellungen"
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
-msgstr "Stunden"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
+msgstr "Lokales Debian-Spiegelserververzeichnis"
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
-msgstr "Minuten"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr "Argonaut Debconf Crawler Konfiguration"
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr "Lokale Paketeordner"
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Datum"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
+msgstr "Ordner in dem der Crawler Paket während der Analyse speichern wird"
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
-msgstr "Zeit"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
+msgstr "Argonaut Repository Konfiguration"
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
-msgstr "Periodischer Auftrag"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
+msgstr "Verzeichnis, in dem Protokolle gespeichert werden sollen"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr "Fehler ignorieren"
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
-msgstr "Tage"
-
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
-msgstr "Wochen"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr "Quelle"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
-msgstr "Monate"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
+msgstr "Quelle im Spiegelserver einbeziehen"
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr "GPG Check"
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
-msgstr "Mehrere argonaut Server gefunden. Nur einer wird unterstützt"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Inhalt"
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
-msgstr "Es ist kein argonaut-Server konfiguriert"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
+msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
-msgstr "\"%s\" konnte nicht gelesen werden!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
+msgstr "Ausführlich"
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
-msgstr "\"%s\" ist keine Datei!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
+msgstr "Ob der verbose-Modus aktiviert werden soll"
 
 #: addons/argonaut/import_events.tpl.c:2
 msgid ""
diff --git a/argonaut/locale/el_GR/fusiondirectory.po b/argonaut/locale/el_GR/fusiondirectory.po
index 84a1c92ac0..21e0c15d90 100644
--- a/argonaut/locale/el_GR/fusiondirectory.po
+++ b/argonaut/locale/el_GR/fusiondirectory.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -21,342 +21,412 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
-msgstr "Πελάτης Argonaut"
-
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
-msgstr "Επεξεργασία ρυθμίσεων του πελάτη Argonaut"
-
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
-msgstr "Ρυθμίσεις πελάτη λογισμικού Argonaut"
-
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
-msgstr "Θύρα πελάτη"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
-msgstr "Θύρα που χρησιμοποιείται από τον πελάτη argonaut για το JSON-RPC"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
-msgstr "Πρωτόκολλο"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
+msgstr "Αδύνατη η ανάγνωση του \"%s\"!"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
-msgstr "Πρωτόκολλο για χρήση στο argonaut"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
+msgstr "Το \"%s\" δεν είναι αρχείο!"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
-msgstr "Διεπαφή εκκίνησης μέσω δικτύου"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
-msgstr "Η διεπαφή που χρησιμοποιεί το argonaut για εκκίνηση μέσω δικτύου"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Παρέχει ένα μηχανισμό ώστε αυτόματα να ενεργοποιεί συστήματα "
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
-msgstr "Αρχείο ταυτότητας διαδικασίας"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Άδεια"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
-msgstr "Αρχείο στο οποίο το argonaut θα αποθηκεύσει της ταυτότητα διαδικασίας του κατά την εκκίνηση"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Αφαίρεση"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
-msgstr "Κατάλογος καταγραφών"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr "Οι ακόλουθες εργασίες δεν γίνεται να διαγραφούν, θα πρέπει να ματαιωθούν: %s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
-msgstr "Κατάλογος στον οποίο ο πελάτης argonaut πρέπει να αποθηκεύει τις καταγραφές του"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
+msgstr "Πληροφορίες"
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
-msgstr "Διαδρομές SSL"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
-msgstr "Κλειδί"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
+msgstr "Λεπτομέρεια λάθους"
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
-msgstr "Διαδρομή για το αρχείο ιδιωτικού κλειδιού στον πελάτη Argonaut"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Σφάλμα"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
-msgstr "Πιστοποιητικό"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
-msgstr "Διαδρομή για το αρχείο πιστοποιητικού στον πελάτη Argonaut"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
+msgstr "αμέσως"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
-msgstr "Πιστοποιητικό CA"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
+msgstr "Αναμονή"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
-msgstr "Διαδρομή για το αρχείο πιστοποιητικού CA στον πελάτη Argonaut"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
+msgstr "Εμφάνιση σφάλματος"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
-msgstr "CN πιστοποιητικού"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
+msgstr "Επεξεργασμένο"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
-msgstr "Το CN του πιστοποιητικού αυτού του πελάτη"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
+msgstr "σε εξέλιξη"
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
-msgstr "Ονομασίες υπηρεσιών"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Κλείσιμο"
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
-msgstr "Ονομασίες υπηρεσιών Argonaut"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Επανεκκίνηση"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
+msgstr "Ενημέρωση λογισμικού"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
-msgstr "Βασικές ρυθμίσεις"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
+msgstr "(Επαν)εγκατάσταση"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
-msgstr "Προκαθορισμένη λειτουργία"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr "Ώρες"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
-msgstr "Κατάλογος στον οποίο το argonaut-fuse θα αποθηκεύει τις καταγραφές του"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr "Λεπτά"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
-msgstr "TFTP"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
-msgstr "Διαδρομή αρχείου διαμόρφωσης Pxelinux"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "Ημερομηνία"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
-msgstr "Κατάλογος στον οποίο το argonaut-fuse θα αποθηκεύει το pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: 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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
-msgstr "Φάκελος τοπικών πακέτων"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr "Ημέρες"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
-msgstr "Φάκελος στον οποίο ο crawler θα αποθηκεύσει τα πακέτα κατα τη διάρκεια της ανάλυσης"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr "Εβδομάδες"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
-msgstr "Ρύθμιση του Argonaut αποθετήριου "
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr "Μήνες"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Διαμεσολαβητής"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr "Περίοδος"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
-msgstr "Καθορίζει τον διαμεσολαβητή του http (π.χ. Squid) που θα χρησιμοποιηθεί για το http και το hfrp πρωτόκολλο"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr "Φάκελοι στους οποίους θα πρέπει να αποθηκευτούν οι καταγραφές"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr "Λάθη που αγνοούνται"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Λίστα εργασιών στην ουρά"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Πηγή"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr "Περιέλαβε την πηγή στον καθρεπτισμό"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Εργασία"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
-msgstr "Έλεγχος GPG"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Κατάσταση"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr "Αποτυχία αν δεν υπάρχει το αρχείο Release.gpg"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Ενέργειες"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Περιεχόμενα"
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+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 "Πρόσθετα κατεβασμένα αρχεία περιεχομένου. <arch>.gz (Προσέξτε ότι αυτά τα αρχεία μπορεί να είναι σχετικά μεγάλα και να αλλάζουν συχνά)"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Ματαίωση"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Εκτέλεση"
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Υπηρεσίες"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Αποστολή"
+
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
 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 "Διακομιστής Argonaut"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
-msgstr "Διαγραφή ολοκληρωμένων διεργασιών"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
-msgstr "Αν ο διακομιστής argonaut θα πρέπει να διαγράφει της επιτυχώς ολοκληρωμένες διεργασίες ή όχι"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr "Άγνωτη υποδομή"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
-msgstr "Πάρε τις πληροφορίες των πακέτων"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr "Η εισαγωγή ολοκληρώθηκε:  %s συμβάντα στάλθηκαν με επιτυχία, %s απέτυχαν"
 
-#: 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 "Αν o argonaut διακομιστής πρέπει ή όχι να πάρει τις πληροφορίες των πακέτων από τα αποθετήρια στην αρχή και μετά μία φορά την ημέρα. Χρειάζεται για τη δημιουργία λίστας των πακέτων FAI."
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "Το αρχείο είναι κενό"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Θύρα"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr "MAC"
+
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr "Πελάτης Argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr "Επεξεργασία ρυθμίσεων του πελάτη Argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr "Ρυθμίσεις πελάτη λογισμικού Argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr "Θύρα πελάτη"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
-msgstr "Η θύρα στην οποία ο argonaut διακομιστής θα ακούει"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
+msgstr "Θύρα που χρησιμοποιείται από τον πελάτη argonaut για το JSON-RPC"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "Λήξη χρόνου:"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr "Πρωτόκολλο"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
-msgstr "Ο χρόνος σε δευτερόλεπτα πριν θεωρήσουμε ότι ο argonaut πελάτης ή διακομιστής έχει πέσει (δεν λειτουργεί)"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
+msgstr "Πρωτόκολλο για χρήση στο argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
-msgstr "Φάκελος στον οποίο ο argonaut θα αποθηκεύσει τις καταγραφές"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
+msgstr "Διεπαφή εκκίνησης μέσω δικτύου"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
-msgstr "Εκκίνηση μέσω δικτύου"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
+msgstr "Η διεπαφή που χρησιμοποιεί το argonaut για εκκίνηση μέσω δικτύου"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
-msgstr "Διεπαφή"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
+msgstr "Αρχείο ταυτότητας διαδικασίας"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
-msgstr "Η διεπαφή που θα χρησιμοποιηθεί για την εκκίνηση μέσω δικτύου"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr "Αρχείο στο οποίο το argonaut θα αποθηκεύσει της ταυτότητα διαδικασίας του κατά την εκκίνηση"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
-msgstr "Εργαλείο IP"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
+msgstr "Κατάλογος καταγραφών"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
-msgstr "To εργαλείο IP που θα χρησιμοποιηθεί"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
+msgstr "Κατάλογος στον οποίο ο πελάτης argonaut πρέπει να αποθηκεύει τις καταγραφές του"
+
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
+msgstr "Διαδρομές SSL"
 
+#: admin/systems/argonaut/class_argonautClient.inc:164
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
-msgstr "Μονοπάτι στο αρχείο του ιδιωτικού κλειδιού στον Argonaut διακομιστή"
+msgid "Key"
+msgstr "Κλειδί"
+
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
+msgstr "Διαδρομή για το αρχείο ιδιωτικού κλειδιού στον πελάτη Argonaut"
 
+#: admin/systems/argonaut/class_argonautClient.inc:169
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
-msgstr "Μονοπάτι στο αρχείο του πιστοποιητικού στον Argonaut διακομιστή"
+msgid "Certificate"
+msgstr "Πιστοποιητικό"
 
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
+msgstr "Διαδρομή για το αρχείο πιστοποιητικού στον πελάτη Argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:174
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
-msgstr "Μονοπάτι στο αρχείο του πιστοποιητικού CA στον Argonaut διακομιστή"
+msgid "CA certificate"
+msgstr "Πιστοποιητικό CA"
+
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
+msgstr "Διαδρομή για το αρχείο πιστοποιητικού CA στον πελάτη Argonaut"
 
+#: admin/systems/argonaut/class_argonautClient.inc:179
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
-msgstr "Το CN στο πιστοποιητικό του διακομιστή"
+msgid "CN of the certificate"
+msgstr "CN πιστοποιητικού"
+
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
+msgstr "Το CN του πιστοποιητικού αυτού του πελάτη"
+
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
+msgstr "Ονομασίες υπηρεσιών"
+
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
+msgstr "Ονομασίες υπηρεσιών Argonaut"
 
 #: 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_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Υπηρεσίες"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr "OPSI"
@@ -377,6 +447,23 @@ msgstr "Διακομιστής Opsi"
 msgid "Opsi lang"
 msgstr "Γλώσσα Opsi"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -451,292 +538,206 @@ msgstr ""
 msgid "LTSP server"
 msgstr "Εξυπηρετητής LTSP"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Κλείσιμο"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Επανεκκίνηση"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr "Ενημέρωση λογισμικού"
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr "(Επαν)εγκατάσταση"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Εισαγωγή"
-
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
-msgstr "Άγνωτη υποδομή"
-
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
-msgstr "Η εισαγωγή ολοκληρώθηκε:  %s συμβάντα στάλθηκαν με επιτυχία, %s απέτυχαν"
-
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "Το αρχείο είναι κενό"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
+msgstr "Βασικές ρυθμίσεις"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
-msgstr "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr "Προκαθορισμένη λειτουργία"
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr "Κατάλογος στον οποίο το argonaut-fuse θα αποθηκεύει τις καταγραφές του"
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr "TFTP"
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Παρέχει ένα μηχανισμό ώστε αυτόματα να ενεργοποιεί συστήματα "
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr "Διαδρομή αρχείου διαμόρφωσης Pxelinux"
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Άδεια"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
+msgstr "Κατάλογος στον οποίο το argonaut-fuse θα αποθηκεύει το pxelinux.cfg"
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-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 "Διακομιστής Argonaut"
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Οι ακόλουθες εργασίες δεν γίνεται να διαγραφούν, θα πρέπει να ματαιωθούν: %s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr "Διαγραφή ολοκληρωμένων διεργασιών"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
-msgstr "Πληροφορίες"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
+msgstr "Αν ο διακομιστής argonaut θα πρέπει να διαγράφει της επιτυχώς ολοκληρωμένες διεργασίες ή όχι"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
+msgstr "Πάρε τις πληροφορίες των πακέτων"
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
-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 "Αν o argonaut διακομιστής πρέπει ή όχι να πάρει τις πληροφορίες των πακέτων από τα αποθετήρια στην αρχή και μετά μία φορά την ημέρα. Χρειάζεται για τη δημιουργία λίστας των πακέτων FAI."
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Θύρα"
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
-msgstr "αμέσως"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr "Η θύρα στην οποία ο argonaut διακομιστής θα ακούει"
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
-msgstr "Αναμονή"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "Λήξη χρόνου:"
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
-msgstr "Εμφάνιση σφάλματος"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr "Ο χρόνος σε δευτερόλεπτα πριν θεωρήσουμε ότι ο argonaut πελάτης ή διακομιστής έχει πέσει (δεν λειτουργεί)"
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
-msgstr "Επεξεργασμένο"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr "Φάκελος στον οποίο ο argonaut θα αποθηκεύσει τις καταγραφές"
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
-msgstr "σε εξέλιξη"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr "Εκκίνηση μέσω δικτύου"
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
-msgstr "Λίστα εργασιών στην ουρά"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr "Διεπαφή"
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr "Η διεπαφή που θα χρησιμοποιηθεί για την εκκίνηση μέσω δικτύου"
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Εργασία"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr "Εργαλείο IP"
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
-msgstr "Περίοδος"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr "To εργαλείο IP που θα χρησιμοποιηθεί"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
-msgstr "Πρόγραμμα"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr "Μονοπάτι στο αρχείο του ιδιωτικού κλειδιού στον Argonaut διακομιστή"
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Κατάσταση"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
+msgstr "Μονοπάτι στο αρχείο του πιστοποιητικού στον Argonaut διακομιστή"
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Ενέργειες"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
+msgstr "Μονοπάτι στο αρχείο του πιστοποιητικού CA στον Argonaut διακομιστή"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Ματαίωση"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
+msgstr "Το CN στο πιστοποιητικό του διακομιστή"
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Εκτέλεση"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
-msgstr "Ώρες"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
-msgstr "Λεπτά"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr "Φάκελος τοπικών πακέτων"
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
+msgstr "Φάκελος στον οποίο ο crawler θα αποθηκεύσει τα πακέτα κατα τη διάρκεια της ανάλυσης"
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Ημερομηνία"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
+msgstr "Ρύθμιση του Argonaut αποθετήριου "
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Διαμεσολαβητής"
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+msgstr "Καθορίζει τον διαμεσολαβητή του http (π.χ. Squid) που θα χρησιμοποιηθεί για το http και το hfrp πρωτόκολλο"
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
+msgstr "Φάκελοι στους οποίους θα πρέπει να αποθηκευτούν οι καταγραφές"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
-msgstr "Περιοδική εργασία"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr "Λάθη που αγνοούνται"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr "Πηγή"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
-msgstr "Ημέρες"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
+msgstr "Περιέλαβε την πηγή στον καθρεπτισμό"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
-msgstr "Εβδομάδες"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr "Έλεγχος GPG"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
-msgstr "Μήνες"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
+msgstr "Αποτυχία αν δεν υπάρχει το αρχείο Release.gpg"
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Περιεχόμενα"
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
-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 "Πρόσθετα κατεβασμένα αρχεία περιεχομένου. <arch>.gz (Προσέξτε ότι αυτά τα αρχεία μπορεί να είναι σχετικά μεγάλα και να αλλάζουν συχνά)"
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
-msgstr "Αδύνατη η ανάγνωση του \"%s\"!"
-
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
-msgstr "Το \"%s\" δεν είναι αρχείο!"
-
 #: addons/argonaut/import_events.tpl.c:2
 msgid ""
 "You can import a list of jobs into the FusionDirectory job queue. This "
diff --git a/argonaut/locale/es/fusiondirectory.po b/argonaut/locale/es/fusiondirectory.po
index 0a7d6b0e87..5848565744 100644
--- a/argonaut/locale/es/fusiondirectory.po
+++ b/argonaut/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
-msgstr "Cliente Argonaut"
-
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
-msgstr "Opciones del cliente Argonaut"
-
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Provee un mecanismo para activar sistemas automáticamente"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Permisos"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Eliminar"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr "Las siguientes tareas no pueden ser eliminadas, han sido canceladas: %s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
-msgstr "Directorio de rgistros"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
-msgstr "Llave"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Error"
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "No se puede actualizar las entradas de la cola."
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
+msgstr "inmediatamente"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
+msgstr "Esperando"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
+msgstr "Procesado"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
+msgstr "en progreso"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Apagar"
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Reiniciar"
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "Despertar"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
+msgstr "Actualización software"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr "Horas"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
-msgstr "Modo por defecto"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr "Minutos"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "Fecha"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
-msgstr "Ruta de configuración Pxelinux"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr "Tiempo"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
-msgstr "Opciones de espejo de Argonaut"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
+msgstr "Programación"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
+msgstr "Tareas periódicas"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
-msgstr "Directorio local de paquetes"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr "Días"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr "Semanas"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr "Meses"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr "Periodo"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Origen"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Lista de trabajos en cola"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr "Evento"
+
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr "Objetivo"
+
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Tarea"
+
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Estado"
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Acciones"
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr "Importar"
+
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Cancelar"
+
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Ejecute"
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
-msgstr "Verificación GPG"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr "Ver registros"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Contenidos"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
-msgstr "Detallado"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Enviar"
+
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Servicios"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Banderas de Fai"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr "Importación completa: %s eventos han sido enviados, %s han fallado"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
-msgstr "Raiz NFS"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "el archivo está vacío"
 
-#: 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 "Servidor Argonaut"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr "MAC"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
-msgstr "Eliminar tareas terminadas"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr "No se puede cargar entradas en la cola: %s"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
-msgstr ""
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr "Cliente Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 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/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr "Opciones del cliente Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Puerto"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "Desconexión por tiempo"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
+msgstr "Directorio de rgistros"
+
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
+#: admin/systems/argonaut/class_argonautClient.inc:164
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+msgid "Key"
+msgstr "Llave"
+
+#: 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
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+msgid "Certificate"
+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
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+msgid "CA certificate"
+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
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+msgid "CN of the certificate"
+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 ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Servicios"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,10 +443,27 @@ msgstr "Servidor Opsi"
 msgid "Opsi lang"
 msgstr "Idioma Opsi"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-msgid "Argonaut DNS settings"
-msgstr "Opciones de DNS de Argonaut"
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr "Banderas de Fai"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr "Raiz NFS"
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+msgid "Argonaut DNS settings"
+msgstr "Opciones de DNS de Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:46
 msgid "Argonaut Ldap2zone settings:"
@@ -447,290 +534,204 @@ msgstr ""
 msgid "LTSP server"
 msgstr "Servidor LTSP"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Apagar"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Reiniciar"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "Despertar"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr "Actualización software"
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Error"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-msgstr "No se puede cargar entradas en la cola: %s"
-
-#: addons/argonaut/class_argonautImportFile.inc:33
-#: addons/argonaut/class_argonautImportFile.inc:36
-msgid "Argonaut task import"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:34
-msgid "Imports argonaut tasks from CSV file"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:49
-msgid "Import actions from CSV file"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr "Modo por defecto"
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
-msgstr "Enviar"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr "Ruta de configuración Pxelinux"
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
-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 "Servidor Argonaut"
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Importar"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr "Eliminar tareas terminadas"
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
-msgstr "Importación completa: %s eventos han sido enviados, %s han fallado"
-
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "el archivo está vacío"
-
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
-msgstr "MAC"
-
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
-msgstr "Evento"
-
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Provee un mecanismo para activar sistemas automáticamente"
-
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Permisos"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Puerto"
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Eliminar"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Las siguientes tareas no pueden ser eliminadas, han sido canceladas: %s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "Desconexión por tiempo"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "No se puede actualizar las entradas de la cola."
-
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
-msgstr "inmediatamente"
-
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
-msgstr "Esperando"
-
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
-msgstr "Procesado"
-
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
-msgstr "en progreso"
-
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
-msgstr "Lista de trabajos en cola"
-
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
-msgstr "Objetivo"
-
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Tarea"
-
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
-msgstr "Periodo"
-
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
-msgstr "Programación"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Estado"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Acciones"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Cancelar"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Ejecute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
-msgstr "Ver registros"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
-msgstr "Horas"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
-msgstr "Minutos"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr "Opciones de espejo de Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Fecha"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
-msgstr "Tiempo"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr "Directorio local de paquetes"
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
-msgstr "Tareas periódicas"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
-msgstr "Días"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
-msgstr "Semanas"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
-msgstr "Meses"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr "Origen"
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr "Verificación GPG"
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Contenidos"
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
+msgstr "Detallado"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/es_CO/fusiondirectory.po b/argonaut/locale/es_CO/fusiondirectory.po
index a71feab633..9fa19e28db 100644
--- a/argonaut/locale/es_CO/fusiondirectory.po
+++ b/argonaut/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Permisos"
+
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Borrar"
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Error"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Estado"
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Acciones"
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+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 "Subir"
+
+#: 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:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 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 ""
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "el archivo está vacio"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Puerto"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -419,318 +506,232 @@ msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Error"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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 "Subir"
-
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "el archivo está vacio"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
+msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Permisos"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Borrar"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Puerto"
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Estado"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Acciones"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/es_VE/fusiondirectory.po b/argonaut/locale/es_VE/fusiondirectory.po
index 51a1d3ed1a..0900c9abe8 100644
--- a/argonaut/locale/es_VE/fusiondirectory.po
+++ b/argonaut/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,351 +17,421 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
-msgstr "Cliente Argonaut"
-
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
-msgstr ""
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr "Varios servidores Argonaut encontrados. Solo se soporta uno"
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
-msgstr "Opciones del cliente Argonaut"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
+msgstr "No hay un servidor Argonaut configurado"
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Provee un mecanismo para activar sistemas automáticamente"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Permisos"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Eliminar"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr "Las siguientes tareas no pueden ser eliminadas, han sido canceladas: %s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
+msgstr "Información"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
-msgstr "Directorio de rgistros"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
+msgstr "%s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
+msgstr "Detalles del error"
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Error"
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
-msgstr "Llave"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "No se puede actualizar las entradas de la cola."
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
+msgstr "inmediatamente"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
+msgstr "Esperando"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
+msgstr "Mostrar error"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
+msgstr "Procesado"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
+msgstr "en progreso"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Apagar"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Reiniciar"
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "Despertar"
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
+msgstr "Actualización software"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr "Horas"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr "Minutos"
+
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
-msgstr "Modo por defecto"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "Fecha"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr "Tiempo"
+
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
-msgstr "Ruta de configuración Pxelinux"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
+msgstr "Programación"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
+msgstr "Tareas periódicas"
+
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
-msgstr "Opciones de espejo de Argonaut"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr "Días"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr "Semanas"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr "Meses"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
-msgstr "Directorio local de paquetes"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr "Periodo"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Lista de trabajos en cola"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr "Evento"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr "Objetivo"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Tarea"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Estado"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Origen"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Acciones"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr "Importar"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
-msgstr "Verificación GPG"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Cancelar"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Ejecute"
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
+msgstr "Procesar ahora"
+
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr "Ver registros"
+
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Contenidos"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
-msgstr "Detallado"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Enviar"
+
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Servicios"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Banderas de Fai"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr "Importación completa: %s eventos han sido enviados, %s han fallado"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
-msgstr "Raiz NFS"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "el archivo está vacío"
 
-#: 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 "Servidor Argonaut"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr "MAC"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
-msgstr "Eliminar tareas terminadas"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr "No se puede cargar entradas en la cola: %s"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
-msgstr ""
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr "Cliente Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 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/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr "Opciones del cliente Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Puerto"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "Desconexión por tiempo"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
+msgstr "Directorio de rgistros"
+
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
+#: admin/systems/argonaut/class_argonautClient.inc:164
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+msgid "Key"
+msgstr "Llave"
+
+#: 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
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+msgid "Certificate"
+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
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+msgid "CA certificate"
+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
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-msgid "Argonaut Fuse OPSI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
-msgid "OPSI"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:50
-msgid "Opsi admin"
-msgstr "Administrador Opsi"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:55
+#: 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_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Servicios"
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
+msgid "OPSI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:50
+msgid "Opsi admin"
+msgstr "Administrador Opsi"
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:55
 msgid "Opsi password"
 msgstr "Clave Opsi"
 
@@ -373,6 +443,23 @@ 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
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr "Banderas de Fai"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr "Raiz NFS"
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -447,290 +534,204 @@ msgstr ""
 msgid "LTSP server"
 msgstr "Servidor LTSP"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Apagar"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Reiniciar"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "Despertar"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr "Actualización software"
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Error"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-msgstr "No se puede cargar entradas en la cola: %s"
-
-#: addons/argonaut/class_argonautImportFile.inc:33
-#: addons/argonaut/class_argonautImportFile.inc:36
-msgid "Argonaut task import"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:34
-msgid "Imports argonaut tasks from CSV file"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:49
-msgid "Import actions from CSV file"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr "Modo por defecto"
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
-msgstr "Enviar"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr "Ruta de configuración Pxelinux"
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
-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 "Servidor Argonaut"
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Importar"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr "Eliminar tareas terminadas"
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
-msgstr "Importación completa: %s eventos han sido enviados, %s han fallado"
-
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "el archivo está vacío"
-
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
-msgstr "MAC"
-
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
-msgstr "Evento"
-
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Provee un mecanismo para activar sistemas automáticamente"
-
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Permisos"
-
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Eliminar"
-
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Las siguientes tareas no pueden ser eliminadas, han sido canceladas: %s"
-
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
-msgstr "Información"
-
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
-msgstr "%s"
-
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
-msgstr "Detalles del error"
-
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "No se puede actualizar las entradas de la cola."
-
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
-msgstr "inmediatamente"
-
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
-msgstr "Esperando"
-
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
-msgstr "Mostrar error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Puerto"
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
-msgstr "Procesado"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
-msgstr "en progreso"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "Desconexión por tiempo"
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
-msgstr "Lista de trabajos en cola"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
-msgstr "Objetivo"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Tarea"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
-msgstr "Periodo"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
-msgstr "Programación"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Estado"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Acciones"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Cancelar"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Ejecute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
-msgstr "Procesar ahora"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
-msgstr "Ver registros"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
-msgstr "Horas"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
-msgstr "Minutos"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr "Opciones de espejo de Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Fecha"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
-msgstr "Tiempo"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr "Directorio local de paquetes"
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
-msgstr "Tareas periódicas"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
-msgstr "Días"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
-msgstr "Semanas"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
-msgstr "Meses"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr "Origen"
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr "Verificación GPG"
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
-msgstr "Varios servidores Argonaut encontrados. Solo se soporta uno"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
+msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
-msgstr "No hay un servidor Argonaut configurado"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Contenidos"
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
+msgstr "Detallado"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/fa_IR/fusiondirectory.po b/argonaut/locale/fa_IR/fusiondirectory.po
index f590ff736f..b3e4c57027 100644
--- a/argonaut/locale/fa_IR/fusiondirectory.po
+++ b/argonaut/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "جواز"
+
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "خطا"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+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_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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -411,326 +498,240 @@ msgid "Allow notify"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
-msgid "Allow update (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "خطا"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "جواز"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/fi_FI/fusiondirectory.po b/argonaut/locale/fi_FI/fusiondirectory.po
index 30b15f86fe..c22f4dfd4a 100644
--- a/argonaut/locale/fi_FI/fusiondirectory.po
+++ b/argonaut/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
-msgstr "Protokolla"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Lupa"
+
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Poista"
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Virhe"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr "Aika"
+
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr "Tapahtuma"
+
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr "Määränpää"
+
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Toiminnot"
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Suorita"
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Palvelut"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Portti"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr "Protokolla"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
+#: admin/systems/argonaut/class_argonautClient.inc:169
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+msgid "Certificate"
+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
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+msgid "CA certificate"
+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
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+msgid "CN of the certificate"
+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 ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Palvelut"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -439,298 +526,212 @@ msgstr ""
 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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Virhe"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
-msgstr "Tapahtuma"
-
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Lupa"
-
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Poista"
-
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Portti"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
-msgstr "Määränpää"
-
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Toiminnot"
-
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Suorita"
-
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
-msgstr "Aika"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/fr/fusiondirectory.po b/argonaut/locale/fr/fusiondirectory.po
index f18039ab00..22560539d9 100644
--- a/argonaut/locale/fr/fusiondirectory.po
+++ b/argonaut/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,342 +18,412 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
-msgstr "Client Argonaut"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr "Plusieurs serveurs Argonaut ont été trouvés. Un seul est supporté pour l'instant"
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
-msgstr "Édition des paramètres du client Argonaut"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
+msgstr "Il n'y a pas de serveur Argonaut configuré"
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
-msgstr "Paramètres du client Argonaut"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
+msgstr "Impossible de lire \"%s\" !"
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
-msgstr "Port du client"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
+msgstr "\"%s\" n'est pas un fichier !"
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
-msgstr "Port utilisé par le client Argonaut pour les requêtes JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
+msgstr "File d'attente du déploiement"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
-msgstr "Protocole"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Procure un mécanisme pour activer des systèmes automatiquement"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
-msgstr "Protocole à utiliser pour Argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Permission"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
-msgstr "Interface WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Supprimer"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
-msgstr "Interface utilisée par argonaut pour le WakeOnLan :"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr "Les tâches suivantes ne peuvent pas être effacées, elles doivent être annulées : %s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
-msgstr "Fichier des id de tâches"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
+msgstr "Info"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
-msgstr "Fichier qu'Argonaut utilise pour stocker les tâches au démarrage"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
+msgstr "%s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
-msgstr "Répertoire des journaux systèmes"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
+msgstr "Détail de l'erreur"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
-msgstr "Dossier des journaux systèmes du client Argonaut"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Erreur"
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
-msgstr "Chemins SSL"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "Impossible de mettre à jour les entrées de la file d'attente."
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
-msgstr "Clef"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
+msgstr "immédiatement"
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
-msgstr "Chemin du fichier contenant la clé privée sur le client Argonaut"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
+msgstr "En attente"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
-msgstr "Certificat"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
+msgstr "Afficher les erreurs"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
-msgstr "Chemin du fichier contenant le certificat sur le client Argonaut"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
+msgstr "Terminé"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
-msgstr "Certificat CA"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
+msgstr "en cours"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
-msgstr "Chemin du fichier contenant le certificat du CA public sur le client Argonaut"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Éteindre"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
-msgstr "CN du certificat"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Redémarrer"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
-msgstr "Le CN dans le certificat client"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "Réveiller"
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
-msgstr "Nom des services"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
+msgstr "Mise à jour logicielle"
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
-msgstr "Noms de services pour Argonaut"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
+msgstr "(Ré)installer"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
-msgstr "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr "Heures"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
-msgstr "Paramètres de Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr "Minutes"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
-msgstr "Paramètres de base"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
+msgstr "Secondes"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
-msgstr "Mode par défaut"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "Date"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
-msgstr "Dossier des jounaux systèmes de argonaut-fuse"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr "Temps"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
-msgstr "TFTP"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
+msgstr "Tache argonaut"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
-msgstr "Répertoire des fichiers pxelinux"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
+msgstr "Planifier une tâche argonaut"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
-msgstr "Chemin où argonaut-fuse stockera le fichier \"pxelinux.cfg\""
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
+msgstr "Planning"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
-msgstr "Paramètres des miroirs Argonaut"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
+msgstr "Tâche périodique"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
-msgstr "Paramètres des miroirs Argonaut"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
+msgstr "Est ce que cette tache doit être récurrente"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr "Répertoire du miroir Debian local"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
+msgstr "Combien de fois doit être répété cette tache"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
-msgstr "Configuration du module debconf crawler d'Argonaut"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr "Jours"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
-msgstr "Répertoire local des paquets"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr "Semaines"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
-msgstr "Dossier de stockage des paquets durant leur analyse"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr "Mois"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
-msgstr "Configuration des dépôts Argonaut"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr "Période"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
+msgstr "Cibles"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
-msgstr "Le proxy http (comme Squid) à utiliser pour les méthode http et hftp"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
+msgstr "Cibles pour cette tache"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr "Répertoire dans lequel les journaux doivent être stockés"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Liste des tâches dans la queue"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr "Ignorer les erreurs"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr "Évènement"
 
-#: 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 "Demande à debmirror d’ignorer les fichiers deb et sources cassés ou manquant mais de continuer les vérifications des fichiers meta"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr "Cible"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Source"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Tâche"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr "Inclus les sources dans le miroir"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Statut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
-msgstr "Vérification GPG"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Actions"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr "Échouer si le fichier Release.gpg est absent"
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr "Importer"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Contenu"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Annuler"
 
-#: 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 "Télécharge en plus les fichiers Contents.<arch>.gz (Notez que ces fichiers peuvent être gros et changer fréquemment)"
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Exécuter"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
-msgstr "Verbeux"
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
+msgstr "Traiter maintenant"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
-msgstr "Activer/Désactiver le mode verbeux"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr "Voir les journaux systèmes"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
-msgstr "Paramètres de Argonaut Fuse pour le module FAI"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
+msgstr "Importation des taches argonaut"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Services"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
+msgstr "Importer taches argonaut depuis un fichier CSV"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
+msgstr "Importer les actions depuis un fichier CSV"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Paramètres FAI"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
+msgstr "Importer une liste de taches dans argonaut"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
-msgstr "racine NFS"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Téléverser"
 
-#: 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 "Serveur Argonaut"
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
+msgstr "Importer un fichier"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
-msgstr "Supprimer les tâches terminées"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
+msgstr "Taches importées "
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
-msgstr "Activer ou non la suppression des tâches terminées avec succès par le serveur Argonaut"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
+msgstr "Fixer les erreurs dans votre CSV"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
-msgstr "Obtenir des informations sur les paquets"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr "Service d’infrastructure"
 
-#: 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 "Si oui ou non le serveur Argonaut devrait obtenir les informations des paquets à partir des dépôts au lancement, puis une fois par jour. Nécessaire pour la création de listes de paquets FAI."
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr "L'importation est finie : %s évènements ont été envoyés, %s ont échoués"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Port"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "le fichier est vide"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
-msgstr "Port d’écoute du serveur Argonaut"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr "MAC"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "Temps d'attente maximum"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr "Impossible de charger les entrées de la queue : %s"
+
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr "Client Argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr "Édition des paramètres du client Argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr "Paramètres du client Argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr "Port du client"
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
+msgstr "Port utilisé par le client Argonaut pour les requêtes JSON-RPC"
+
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr "Protocole"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
-msgstr "Délai en secondes avant de considérer le système argonaut (client ou serveur) comme éteint"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
+msgstr "Protocole à utiliser pour Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
-msgstr "Répertoire contenant les journaux systèmes d'Argonaut"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
+msgstr "Interface WakeOnLan"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
-msgstr "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
+msgstr "Interface utilisée par argonaut pour le WakeOnLan :"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
-msgstr "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
+msgstr "Fichier des id de tâches"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
-msgstr "Interface à utiliser pour les requêtes WakeOnLan"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr "Fichier qu'Argonaut utilise pour stocker les tâches au démarrage"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
-msgstr "Outil IP"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
+msgstr "Répertoire des journaux systèmes"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
-msgstr "Outil IP à utiliser"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
+msgstr "Dossier des journaux systèmes du client Argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
+msgstr "Chemins SSL"
 
+#: admin/systems/argonaut/class_argonautClient.inc:164
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
-msgstr "Chemin du fichier contenant la clé privée sur le serveur Argonaut"
+msgid "Key"
+msgstr "Clef"
+
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
+msgstr "Chemin du fichier contenant la clé privée sur le client Argonaut"
 
+#: admin/systems/argonaut/class_argonautClient.inc:169
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
-msgstr "Chemin du fichier contenant le certificat sur le serveur Argonaut"
+msgid "Certificate"
+msgstr "Certificat"
+
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
+msgstr "Chemin du fichier contenant le certificat sur le client Argonaut"
 
+#: admin/systems/argonaut/class_argonautClient.inc:174
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
-msgstr "Chemin du fichier contenant le certificat du CA public sur le serveur Argonaut"
+msgid "CA certificate"
+msgstr "Certificat CA"
+
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
+msgstr "Chemin du fichier contenant le certificat du CA public sur le client Argonaut"
 
+#: admin/systems/argonaut/class_argonautClient.inc:179
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
-msgstr "Le CN dans le certificat serveur"
+msgid "CN of the certificate"
+msgstr "CN du certificat"
+
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
+msgstr "Le CN dans le certificat client"
+
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
+msgstr "Nom des services"
+
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
+msgstr "Noms de services pour Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Services"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr "OPSI"
@@ -374,6 +444,23 @@ 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
+msgid "Argonaut Fuse FAI module settings"
+msgstr "Paramètres de Argonaut Fuse pour le module FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr "Paramètres FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr "racine NFS"
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -448,291 +535,205 @@ msgstr "LTSP"
 msgid "LTSP server"
 msgstr "Serveur LTSP"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Éteindre"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Redémarrer"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "Réveiller"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr "Mise à jour logicielle"
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr "(Ré)installer"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Erreur"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-msgstr "Impossible de charger les entrées de la queue : %s"
-
-#: addons/argonaut/class_argonautImportFile.inc:33
-#: addons/argonaut/class_argonautImportFile.inc:36
-msgid "Argonaut task import"
-msgstr "Importation des taches argonaut"
-
-#: addons/argonaut/class_argonautImportFile.inc:34
-msgid "Imports argonaut tasks from CSV file"
-msgstr "Importer taches argonaut depuis un fichier CSV"
-
-#: addons/argonaut/class_argonautImportFile.inc:49
-msgid "Import actions from CSV file"
-msgstr "Importer les actions depuis un fichier CSV"
-
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
-msgstr "Importer une liste de taches dans argonaut"
-
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
-msgstr "Téléverser"
-
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
-msgstr "Importer un fichier"
-
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
-msgstr "Taches importées "
-
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Importer"
-
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
-msgstr "Fixer les erreurs dans votre CSV"
-
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
-msgstr "Service d’infrastructure"
-
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
-msgstr "L'importation est finie : %s évènements ont été envoyés, %s ont échoués"
-
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "le fichier est vide"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
+msgstr "Argonaut Fuse"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
-msgstr "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
+msgstr "Paramètres de Argonaut Fuse"
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
-msgstr "Évènement"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
+msgstr "Paramètres de base"
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
-msgstr "File d'attente du déploiement"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr "Mode par défaut"
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Procure un mécanisme pour activer des systèmes automatiquement"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr "Dossier des jounaux systèmes de argonaut-fuse"
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Permission"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr "TFTP"
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Supprimer"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr "Répertoire des fichiers pxelinux"
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Les tâches suivantes ne peuvent pas être effacées, elles doivent être annulées : %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
+msgstr "Chemin où argonaut-fuse stockera le fichier \"pxelinux.cfg\""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
-msgstr "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
+msgstr "Serveur Argonaut"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
-msgstr "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr "Supprimer les tâches terminées"
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
-msgstr "Détail de l'erreur"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
+msgstr "Activer ou non la suppression des tâches terminées avec succès par le serveur Argonaut"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "Impossible de mettre à jour les entrées de la file d'attente."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
+msgstr "Obtenir des informations sur les paquets"
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
-msgstr "immédiatement"
+#: 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 "Si oui ou non le serveur Argonaut devrait obtenir les informations des paquets à partir des dépôts au lancement, puis une fois par jour. Nécessaire pour la création de listes de paquets FAI."
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
-msgstr "En attente"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Port"
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
-msgstr "Afficher les erreurs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr "Port d’écoute du serveur Argonaut"
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
-msgstr "Terminé"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "Temps d'attente maximum"
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
-msgstr "en cours"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr "Délai en secondes avant de considérer le système argonaut (client ou serveur) comme éteint"
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
-msgstr "Liste des tâches dans la queue"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr "Répertoire contenant les journaux systèmes d'Argonaut"
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
-msgstr "Cible"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr "Wake on lan"
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Tâche"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr "Interface"
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
-msgstr "Période"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr "Interface à utiliser pour les requêtes WakeOnLan"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
-msgstr "Planning"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr "Outil IP"
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Statut"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr "Outil IP à utiliser"
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Actions"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr "Chemin du fichier contenant la clé privée sur le serveur Argonaut"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Annuler"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
+msgstr "Chemin du fichier contenant le certificat sur le serveur Argonaut"
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Exécuter"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
+msgstr "Chemin du fichier contenant le certificat du CA public sur le serveur Argonaut"
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
-msgstr "Traiter maintenant"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
+msgstr "Le CN dans le certificat serveur"
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
-msgstr "Voir les journaux systèmes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr "Paramètres des miroirs Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
-msgstr "Heures"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr "Paramètres des miroirs Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
-msgstr "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
+msgstr "Répertoire du miroir Debian local"
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
-msgstr "Secondes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr "Configuration du module debconf crawler d'Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr "Répertoire local des paquets"
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
-msgstr "Temps"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
+msgstr "Dossier de stockage des paquets durant leur analyse"
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
-msgstr "Tache argonaut"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
+msgstr "Configuration des dépôts Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
-msgstr "Planifier une tâche argonaut"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
-msgstr "Tâche périodique"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+msgstr "Le proxy http (comme Squid) à utiliser pour les méthode http et hftp"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
-msgstr "Est ce que cette tache doit être récurrente"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
+msgstr "Répertoire dans lequel les journaux doivent être stockés"
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
-msgstr "Combien de fois doit être répété cette tache"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr "Ignorer les erreurs"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
-msgstr "Jours"
+#: 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 "Demande à debmirror d’ignorer les fichiers deb et sources cassés ou manquant mais de continuer les vérifications des fichiers meta"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
-msgstr "Semaines"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr "Source"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
-msgstr "Mois"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
+msgstr "Inclus les sources dans le miroir"
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
-msgstr "Cibles"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr "Vérification GPG"
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
-msgstr "Cibles pour cette tache"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
+msgstr "Échouer si le fichier Release.gpg est absent"
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
-msgstr "Plusieurs serveurs Argonaut ont été trouvés. Un seul est supporté pour l'instant"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Contenu"
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
-msgstr "Il n'y a pas de serveur Argonaut configuré"
+#: 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 "Télécharge en plus les fichiers Contents.<arch>.gz (Notez que ces fichiers peuvent être gros et changer fréquemment)"
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
-msgstr "Impossible de lire \"%s\" !"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
+msgstr "Verbeux"
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
-msgstr "\"%s\" n'est pas un fichier !"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
+msgstr "Activer/Désactiver le mode verbeux"
 
 #: addons/argonaut/import_events.tpl.c:2
 msgid ""
diff --git a/argonaut/locale/hu_HU/fusiondirectory.po b/argonaut/locale/hu_HU/fusiondirectory.po
index ef61eab1e0..a3b828d6d1 100644
--- a/argonaut/locale/hu_HU/fusiondirectory.po
+++ b/argonaut/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+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_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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -409,328 +496,242 @@ msgstr ""
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:67
 msgid "Allow notify"
 msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
-msgid "Allow update (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
+msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/id/fusiondirectory.po b/argonaut/locale/id/fusiondirectory.po
index d3b9792d00..633b7d7673 100644
--- a/argonaut/locale/id/fusiondirectory.po
+++ b/argonaut/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+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_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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -409,328 +496,242 @@ msgstr ""
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:67
 msgid "Allow notify"
 msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
-msgid "Allow update (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
+msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/it_IT/fusiondirectory.po b/argonaut/locale/it_IT/fusiondirectory.po
index 94054924d3..d1ef8fa63e 100644
--- a/argonaut/locale/it_IT/fusiondirectory.po
+++ b/argonaut/locale/it_IT/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -17,342 +17,412 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
-msgstr "Cliente Argonaut"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr "Trovati più di un server Argonaut. Solo uno è supportato"
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
-msgstr "Modificare le impostazioni del cliente argonaut"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
+msgstr "Non c'è nessun server Argonaut configurato"
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
-msgstr "Impostazioni del cliente Argonaut"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
+msgstr "Impossibile analizzare \"%s\"!"
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
-msgstr "Porta del cliente"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
+msgstr "\"%s\" non é un file!"
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
-msgstr "Porta usata dal cliente argonaut per JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
+msgstr "Coda della distribuzione"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
-msgstr "Protocollo"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Fornire un meccanismo per attivare automaticamente i sistemi"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
-msgstr "Protocollo da usare per argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Permessi"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
-msgstr "Interfaccia WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Elimina"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
-msgstr "Interfaccia usata da ragonaut per il WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr "I lavori seguenti non possono essere cancellati, devono essere interrotti: %s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
-msgstr "File TaskId"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
+msgstr "Info"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
-msgstr "File che Argonaut utilizzerà per memorizzare il suo task id all'avvio"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
+msgstr "%s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
-msgstr "Cartella degli errori"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
+msgstr "Dettaglio dell'errore"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
-msgstr "Cartella nella quale il cliente argonaut scriverà i suoi log"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Errore"
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
-msgstr "Percorsi SSL"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "Impossibile aggiornare la coda delle entry."
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
-msgstr "Key"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
+msgstr "immediatamente"
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
-msgstr "Percorso del file contenente la chiave privata su Argonaut"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
+msgstr "In attesa"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
-msgstr "Certificato"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
+msgstr "Mostra l'errore"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
-msgstr "Percorso del file contenente il certificato sul cliente Argonaut"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
+msgstr "Finito"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
-msgstr "Certificato CA"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
+msgstr "in corso"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
-msgstr "Percorso del file contenente il certificato CA sul cliente Argonaut "
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Spegni"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
-msgstr "CN del certificato"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Riavvia"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
-msgstr "CN in questo certificato cliente"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "Risvegliare"
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
-msgstr "Nomi dei servizi"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
+msgstr "Aggiornamento del software"
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
-msgstr "Nomi dei servizi argonaut"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
+msgstr "(Re)Installa"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
-msgstr "Impostazioni Fuse di Argonaut"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr "Ore"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
-msgstr "Impostazioni Fuse di Argonaut"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr "Minuti"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
-msgstr "Impostazioni di base"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
+msgstr "Secondi"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
-msgstr "Modalità di default"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "Data"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
-msgstr "Cartella nella quale argonaut-fuse immagazzinerà i suoi file di log"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr "Tempo"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
-msgstr "TFTP"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
+msgstr "Compito di Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
-msgstr "Path per la configurazione di Pxelinux"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
+msgstr "Programma un compito di Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
-msgstr "Percorso dove argonaut-fuse dovrebbe conservare il file pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
+msgstr "Pianifica"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
-msgstr "Impostazioni del mirror di Argonaut"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
+msgstr "Lavoro periodico"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
-msgstr "Impostazioni del mirror di Argonaut"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
+msgstr "Opzioni filesystem tune"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr "Elenco locale del mirror Debian"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
+msgstr "Frequenza con la quale questa attività dovrebbe essere ripetuta"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
-msgstr "Configurazione Debconf Crawler di Argonaut"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr "Giorni"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
-msgstr "Cartella locale dei pacchetti"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr "Settimane"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
-msgstr "Cartella in cui il crawler memorizzerà i pacchetti durante l'analisi"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr "Mesi"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
-msgstr "Configurazione del Repository di Argonaut"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr "Periodo"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
+msgstr "Obiettivi"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
-msgstr "Specifica il proxy http (come Squid) per utilizzo metodo http e hftp"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
+msgstr "Obiettivi di questa attività"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr "Directory in cui i registri devono essere conservati"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Elenco dei lavori in coda"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr "Ignorare gli errori"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr "Evento"
 
-#: 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 "CN nel certificato del server"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr "Obiettivo"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Origine"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Attività"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr "Includere la fonte nel mirror"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Stato"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
-msgstr "Verifica GPG"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Azioni"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr "Fallimento se manca il file Release.gpg"
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr "Importa"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Contenuti"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Annulla"
 
-#: 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 "Contenuti addizionali scaricati. File <arch>.gz (N.B.: questi files possono essere relativamente grossi e possono cambiare frequentemente)"
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Esegui"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
-msgstr "Dettagliato"
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
+msgstr "in corso"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
-msgstr "Se attivare la modalità verbose"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr "Vedi i logs di sitema"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
-msgstr "Impostazioni del modulo Argonaut Fuse FAI"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
+msgstr "Importazione compito di Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Servizi"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
+msgstr "Importazione compiti di Argonaut dal file CSV"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
+msgstr "Importare azioni dal file CSV"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Fai flags"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
+msgstr "Importare una lista di attività in Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
-msgstr "Radice NFS"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Caricare"
 
-#: 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 "Server Argonaut"
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
+msgstr "Importa file"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
-msgstr "Cancella le operazioni terminate"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
+msgstr "Attività importate"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
-msgstr "Se é vero o meno che il server argonaut dovrebbe cancellare le tasks terminate con successo"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
+msgstr "Prima di tutto fissa gli errori nel tuo file CSV"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
-msgstr "Ottenere pachetti d'informazioni"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr "Servizio d'infrastruttura"
 
-#: 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 "Sia che il server Argonaut ottenga informazioni dei pacchetti dai repository all'inizio e poi una volta al giorno o no. Necessario per la creazione della lista dei pacchetti FAI."
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr "Importazione completata: %s eventi inviati correttamente, %s falliti"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Porta"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "il file è vuoto"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
-msgstr "Porta sulla quale il server argonaut è all'ascolto"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr "MAC"
+
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr "Impossibile caricare le entry della coda: %s"
+
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr "Cliente Argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr "Modificare le impostazioni del cliente argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr "Impostazioni del cliente Argonaut"
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr "Porta del cliente"
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
+msgstr "Porta usata dal cliente argonaut per JSON-RPC"
+
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr "Protocollo"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "Tempo di attesa massimo"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
+msgstr "Protocollo da usare per argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
-msgstr "Tempo in secondi prima di prendere in considerazione un client o un server Argonaut come inattivo "
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
+msgstr "Interfaccia WakeOnLan"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
-msgstr "Cartella nella quale argonaut immagazzinerà i suoi file di log"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
+msgstr "Interfaccia usata da ragonaut per il WakeOnLan"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
-msgstr "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
+msgstr "File TaskId"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
-msgstr "Interfaccia"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr "File che Argonaut utilizzerà per memorizzare il suo task id all'avvio"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
-msgstr "Interfaccia da usare per l'invio delle richieste  WakeOnLan"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
+msgstr "Cartella degli errori"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
-msgstr "Strumento IP"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
+msgstr "Cartella nella quale il cliente argonaut scriverà i suoi log"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
-msgstr "Strumento IP da usare"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
+msgstr "Percorsi SSL"
 
+#: admin/systems/argonaut/class_argonautClient.inc:164
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+msgid "Key"
+msgstr "Key"
+
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr "Percorso del file contenente la chiave privata su Argonaut"
 
+#: admin/systems/argonaut/class_argonautClient.inc:169
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+msgid "Certificate"
+msgstr "Certificato"
+
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr "Percorso del file contenente il certificato sul cliente Argonaut"
 
+#: admin/systems/argonaut/class_argonautClient.inc:174
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
-msgstr "Percorso del file contenente il certificato CA sul cliente Argonaut"
+msgid "CA certificate"
+msgstr "Certificato CA"
+
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
+msgstr "Percorso del file contenente il certificato CA sul cliente Argonaut "
 
+#: admin/systems/argonaut/class_argonautClient.inc:179
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+msgid "CN of the certificate"
+msgstr "CN del certificato"
+
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr "CN in questo certificato cliente"
 
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
+msgstr "Nomi dei servizi"
+
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
+msgstr "Nomi dei servizi argonaut"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Servizi"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr "OPSI"
@@ -373,6 +443,23 @@ 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
+msgid "Argonaut Fuse FAI module settings"
+msgstr "Impostazioni del modulo Argonaut Fuse FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr "Fai flags"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr "Radice NFS"
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -447,291 +534,205 @@ msgstr "LTSP"
 msgid "LTSP server"
 msgstr "Server LTSP"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Spegni"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Riavvia"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "Risvegliare"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr "Aggiornamento del software"
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr "(Re)Installa"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Errore"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-msgstr "Impossibile caricare le entry della coda: %s"
-
-#: addons/argonaut/class_argonautImportFile.inc:33
-#: addons/argonaut/class_argonautImportFile.inc:36
-msgid "Argonaut task import"
-msgstr "Importazione compito di Argonaut"
-
-#: addons/argonaut/class_argonautImportFile.inc:34
-msgid "Imports argonaut tasks from CSV file"
-msgstr "Importazione compiti di Argonaut dal file CSV"
-
-#: addons/argonaut/class_argonautImportFile.inc:49
-msgid "Import actions from CSV file"
-msgstr "Importare azioni dal file CSV"
-
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
-msgstr "Importare una lista di attività in Argonaut"
-
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
-msgstr "Caricare"
-
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
-msgstr "Importa file"
-
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
-msgstr "Attività importate"
-
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Importa"
-
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
-msgstr "Prima di tutto fissa gli errori nel tuo file CSV"
-
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
-msgstr "Servizio d'infrastruttura"
-
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
-msgstr "Importazione completata: %s eventi inviati correttamente, %s falliti"
-
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "il file è vuoto"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
+msgstr "Impostazioni Fuse di Argonaut"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
-msgstr "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
+msgstr "Impostazioni Fuse di Argonaut"
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
-msgstr "Evento"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
+msgstr "Impostazioni di base"
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
-msgstr "Coda della distribuzione"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr "Modalità di default"
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Fornire un meccanismo per attivare automaticamente i sistemi"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr "Cartella nella quale argonaut-fuse immagazzinerà i suoi file di log"
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Permessi"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr "TFTP"
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Elimina"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr "Path per la configurazione di Pxelinux"
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "I lavori seguenti non possono essere cancellati, devono essere interrotti: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
+msgstr "Percorso dove argonaut-fuse dovrebbe conservare il file pxelinux.cfg"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
-msgstr "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
+msgstr "Server Argonaut"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
-msgstr "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr "Cancella le operazioni terminate"
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
-msgstr "Dettaglio dell'errore"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
+msgstr "Se é vero o meno che il server argonaut dovrebbe cancellare le tasks terminate con successo"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "Impossibile aggiornare la coda delle entry."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
+msgstr "Ottenere pachetti d'informazioni"
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
-msgstr "immediatamente"
+#: 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 "Sia che il server Argonaut ottenga informazioni dei pacchetti dai repository all'inizio e poi una volta al giorno o no. Necessario per la creazione della lista dei pacchetti FAI."
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
-msgstr "In attesa"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Porta"
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
-msgstr "Mostra l'errore"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr "Porta sulla quale il server argonaut è all'ascolto"
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
-msgstr "Finito"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "Tempo di attesa massimo"
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
-msgstr "in corso"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr "Tempo in secondi prima di prendere in considerazione un client o un server Argonaut come inattivo "
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
-msgstr "Elenco dei lavori in coda"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr "Cartella nella quale argonaut immagazzinerà i suoi file di log"
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
-msgstr "Obiettivo"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr "Wake on lan"
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Attività"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr "Interfaccia"
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
-msgstr "Periodo"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr "Interfaccia da usare per l'invio delle richieste  WakeOnLan"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
-msgstr "Pianifica"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr "Strumento IP"
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Stato"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr "Strumento IP da usare"
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Azioni"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr "Percorso del file contenente la chiave privata su Argonaut"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Annulla"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
+msgstr "Percorso del file contenente il certificato sul cliente Argonaut"
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Esegui"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
+msgstr "Percorso del file contenente il certificato CA sul cliente Argonaut"
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
-msgstr "in corso"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
+msgstr "CN in questo certificato cliente"
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
-msgstr "Vedi i logs di sitema"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr "Impostazioni del mirror di Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
-msgstr "Ore"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr "Impostazioni del mirror di Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
-msgstr "Minuti"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
+msgstr "Elenco locale del mirror Debian"
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
-msgstr "Secondi"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr "Configurazione Debconf Crawler di Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Data"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr "Cartella locale dei pacchetti"
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
-msgstr "Tempo"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
+msgstr "Cartella in cui il crawler memorizzerà i pacchetti durante l'analisi"
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
-msgstr "Compito di Argonaut"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
+msgstr "Configurazione del Repository di Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
-msgstr "Programma un compito di Argonaut"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
-msgstr "Lavoro periodico"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+msgstr "Specifica il proxy http (come Squid) per utilizzo metodo http e hftp"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
-msgstr "Opzioni filesystem tune"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
+msgstr "Directory in cui i registri devono essere conservati"
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
-msgstr "Frequenza con la quale questa attività dovrebbe essere ripetuta"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr "Ignorare gli errori"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
-msgstr "Giorni"
+#: 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 "CN nel certificato del server"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
-msgstr "Settimane"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr "Origine"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
-msgstr "Mesi"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
+msgstr "Includere la fonte nel mirror"
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
-msgstr "Obiettivi"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr "Verifica GPG"
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
-msgstr "Obiettivi di questa attività"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
+msgstr "Fallimento se manca il file Release.gpg"
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
-msgstr "Trovati più di un server Argonaut. Solo uno è supportato"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Contenuti"
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
-msgstr "Non c'è nessun server Argonaut configurato"
+#: 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 "Contenuti addizionali scaricati. File <arch>.gz (N.B.: questi files possono essere relativamente grossi e possono cambiare frequentemente)"
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
-msgstr "Impossibile analizzare \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
+msgstr "Dettagliato"
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
-msgstr "\"%s\" non é un file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
+msgstr "Se attivare la modalità verbose"
 
 #: addons/argonaut/import_events.tpl.c:2
 msgid ""
diff --git a/argonaut/locale/lv/fusiondirectory.po b/argonaut/locale/lv/fusiondirectory.po
index c1e14ffc44..c8c041cc14 100644
--- a/argonaut/locale/lv/fusiondirectory.po
+++ b/argonaut/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Atļauja"
+
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Noņemt"
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Kļūda"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Darbības"
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: 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_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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -415,322 +502,236 @@ msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Kļūda"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Atļauja"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Noņemt"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Darbības"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/nb/fusiondirectory.po b/argonaut/locale/nb/fusiondirectory.po
index 142b4d2c47..da76fd960b 100644
--- a/argonaut/locale/nb/fusiondirectory.po
+++ b/argonaut/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Fjern"
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Feil"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+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_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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -411,326 +498,240 @@ msgid "Allow notify"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
-msgid "Allow update (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Feil"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Fjern"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/nl/fusiondirectory.po b/argonaut/locale/nl/fusiondirectory.po
index 64a7bff8e3..5ec8daa1e6 100644
--- a/argonaut/locale/nl/fusiondirectory.po
+++ b/argonaut/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
-msgstr "Argonaut client"
-
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
-msgstr ""
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr "Meerdere argonaut servers gevonden. Er is maar 1 mogelijk"
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
-msgstr "Argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
+msgstr " Er is geen argonaut server geconfigureerd"
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Zorg voor een mechanisme om automatisch systemen te activeren"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Recht"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Verwijderen"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr "De volgende jobs kunnen niet worden verwijderd, ze moeten afgebroken worden: %s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
+msgstr "Info"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
-msgstr "Log map"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
+msgstr "%s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
+msgstr "Fout detail"
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Fout"
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
-msgstr "Sleutel"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "Kan queue waarde niet updaten."
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
+msgstr "onmiddellijk"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
+msgstr "Wachten"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
+msgstr "Toon fouten"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
+msgstr "Verwerkte"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
+msgstr "in verwerking"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Uitschakelen"
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Herstarten"
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "Aanzetten"
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
-msgstr ""
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
+msgstr "Software update"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
-msgstr "Argonaut Fuse instellingen"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr "Uren"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr "Minuten"
+
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
-msgstr "Default mode"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "Datum"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr "Tijd"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
-msgstr "Pxelinux cfg pad"
-
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
-msgstr "Argonaut Mirror instellingen"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
+msgstr "Plan"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
-msgstr "Argonaut mirror instellingen"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
+msgstr "Periodieke job"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
-msgstr "Lokale packages map"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr "Dagen"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr "Weken"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
-msgstr ""
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr "Maanden"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr "Periode"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Lijst van queued jobs"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr "Event"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Bron"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr "Doel"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Taak"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
-msgstr "GPG verificatie"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Status"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Acties"
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr "Importeren"
+
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Onderbreek"
+
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Commando"
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
+msgstr "Verwerk nu"
+
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr "Toon logs"
+
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Inhoud"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
-msgstr "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Uploaden"
+
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Services"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Fai flags"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr "Importeren voltooid : %s events succesvol verzonde, %s mislukt"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
-msgstr "NFS root"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "bestand is leeg"
 
-#: 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 "Argonaut server"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr "MAC"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
-msgstr "Verwijder beindigde taken"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr "Kan queue gegevens : %s niet laden"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
-msgstr ""
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr "Argonaut client"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 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/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr "Argonaut client settings"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Poort"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
+msgstr "Log map"
+
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
+#: admin/systems/argonaut/class_argonautClient.inc:164
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+msgid "Key"
+msgstr "Sleutel"
+
+#: 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
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+msgid "Certificate"
+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
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+msgid "CA certificate"
+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
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+msgid "CN of the certificate"
+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 ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,8 +415,16 @@ msgstr ""
 msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
-msgid "OPSI"
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Services"
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
+msgid "OPSI"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:50
@@ -373,6 +443,23 @@ 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
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr "Fai flags"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr "NFS root"
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -447,290 +534,204 @@ msgstr ""
 msgid "LTSP server"
 msgstr "LTSP server"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Uitschakelen"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Herstarten"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "Aanzetten"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr "Software update"
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Fout"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-msgstr "Kan queue gegevens : %s niet laden"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
+msgstr "Argonaut Fuse instellingen"
 
-#: addons/argonaut/class_argonautImportFile.inc:33
-#: addons/argonaut/class_argonautImportFile.inc:36
-msgid "Argonaut task import"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:34
-msgid "Imports argonaut tasks from CSV file"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr "Default mode"
 
-#: addons/argonaut/class_argonautImportFile.inc:49
-msgid "Import actions from CSV file"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
-msgstr "Uploaden"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr "Pxelinux cfg pad"
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
-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 "Argonaut server"
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Importeren"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr "Verwijder beindigde taken"
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
-msgstr "Importeren voltooid : %s events succesvol verzonde, %s mislukt"
-
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "bestand is leeg"
-
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
-msgstr "MAC"
-
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
-msgstr "Event"
-
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Zorg voor een mechanisme om automatisch systemen te activeren"
-
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Recht"
-
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "De volgende jobs kunnen niet worden verwijderd, ze moeten afgebroken worden: %s"
-
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
-msgstr "Info"
-
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
-msgstr "%s"
-
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
-msgstr "Fout detail"
-
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "Kan queue waarde niet updaten."
-
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
-msgstr "onmiddellijk"
-
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
-msgstr "Wachten"
-
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
-msgstr "Toon fouten"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Poort"
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
-msgstr "Verwerkte"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
-msgstr "in verwerking"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "Timeout"
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
-msgstr "Lijst van queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
-msgstr "Doel"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Taak"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
-msgstr "Periode"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
-msgstr "Plan"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Acties"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Onderbreek"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Commando"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
-msgstr "Verwerk nu"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
-msgstr "Toon logs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
-msgstr "Uren"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr "Argonaut Mirror instellingen"
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
-msgstr "Minuten"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr "Argonaut mirror instellingen"
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Datum"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
-msgstr "Tijd"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr "Lokale packages map"
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
-msgstr "Periodieke job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
-msgstr "Dagen"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
-msgstr "Weken"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
-msgstr "Maanden"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr "Bron"
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr "GPG verificatie"
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
-msgstr "Meerdere argonaut servers gevonden. Er is maar 1 mogelijk"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
+msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
-msgstr " Er is geen argonaut server geconfigureerd"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Inhoud"
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
+msgstr "Verbose"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/pl/fusiondirectory.po b/argonaut/locale/pl/fusiondirectory.po
index 99c4160964..7518032a5d 100644
--- a/argonaut/locale/pl/fusiondirectory.po
+++ b/argonaut/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Uprawnienie"
+
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Usuń"
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Błąd"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Wyłącz"
+
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Restartuj"
+
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "Zbudź"
+
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "Data"
+
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Zadanie"
+
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Status"
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Akcje"
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr "Import"
+
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Uruchom"
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Źródło"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Wgraj"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Zawartość"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Usługi"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Usługi"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -423,314 +510,228 @@ msgid "TTL"
 msgstr "TTL"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Wyłącz"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Restartuj"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "Zbudź"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Błąd"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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 "Wgraj"
-
-#: 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:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Import"
-
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Uprawnienie"
-
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Usuń"
-
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Port"
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Zadanie"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "Timeout"
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Akcje"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Uruchom"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Data"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr "Źródło"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Zawartość"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: 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 ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/pt/fusiondirectory.po b/argonaut/locale/pt/fusiondirectory.po
index 85ccfe415f..de4365f3b3 100644
--- a/argonaut/locale/pt/fusiondirectory.po
+++ b/argonaut/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Remover"
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Erro"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Estatus"
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Ações"
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: 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_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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -415,322 +502,236 @@ msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Erro"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Remover"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Estatus"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Ações"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/pt_BR/fusiondirectory.po b/argonaut/locale/pt_BR/fusiondirectory.po
index c27e5428c2..12388e4045 100644
--- a/argonaut/locale/pt_BR/fusiondirectory.po
+++ b/argonaut/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,342 +17,412 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
-msgstr "Cliente Argonaut"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr "Servidores múltiplos argonaut encontrados. Apenas um é suportado"
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
-msgstr "Editar configurações de cliente argonaut"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
+msgstr "Este não é um servidor argonaut configurado"
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
-msgstr "Configurações de cliente Argonaut"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
-msgstr "Porta do cliente"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
-msgstr "Porta usado pelo cliente argonaut para JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
+msgstr "Fila de implantação"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
-msgstr "Protocolo"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Prover um mecanismo para ativar os sistemas automaticamente"
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
-msgstr "Protocolo usado pelo argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Permissão"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
-msgstr "Interface WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Remover"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
-msgstr "Interface usada pelo argonaut para WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr "Os trabalhos seguintes não puderam ser deletados, tivemos que abortar: %s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
-msgstr "Arquivo TaskId"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
+msgstr "Informações"
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
-msgstr "Arquivo o qual argonaut usará para armazenar sua task id quando inicializar"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
+msgstr "%s"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
-msgstr "Diretório de registro"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
+msgstr "Detalhes do erro"
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
-msgstr "Diretório o qual o cliente argonaut deve escrever seus registros"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Erro"
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "Não foi possível atualizar a fila de entradas"
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
-msgstr "Chave"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
+msgstr "Imediatamente"
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
+msgstr "Esperando"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
+msgstr "Mostrar erro"
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
+msgstr "Processado"
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
+msgstr "em progresso"
+
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Desligue"
+
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Reiniciar"
+
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "Acordar"
+
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
+msgstr "Atualização de software"
+
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
+msgstr "(Re)Instalar"
+
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr "Horas"
+
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr "Minutos"
+
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "Data"
+
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
-msgstr "Nomes dos Serviços"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
+msgstr "Programação"
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
-msgstr "Nome dos serviços Argonaut"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
+msgstr "Trabalho periódico"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
-msgstr "Configurações Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
-msgstr "Configurações básicas"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr "Dias"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
-msgstr "Modo padrão"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr "Semanas"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
-msgstr "Diretório o qual argonaut-fuse irá armazenar seu registro"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr "Meses"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
-msgstr "TFTP"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr "Período"
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
-msgstr "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
-msgstr "Pacote onde argonaut-fuse devera armazenar pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
-msgstr "Configurações Argonaut Mirror"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Lista de filas de trabalho"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
-msgstr "Configurações mirror do Argonaut"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr "Evento"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr "Destino"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
-msgstr "Configuração Argonaut Debconf Crawler"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Tarefa"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
-msgstr "Paste de pacotes locais"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Estado"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
-msgstr "Pasta onde o rastreador armazenará os pacotes durante a análise"
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Ações"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
-msgstr "Configuração de repositório Argonaut"
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr "Importar"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Abortar"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Executar"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
+msgstr "Processar agora"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr "Ver registros"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Fonte"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
-msgstr "Verifique GPG"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Conteúdo"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Upload"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
-msgstr "Verbose"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
-msgstr "Aperte para ativar o modo detalhado"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
-msgstr "Módulos de configuração FAI do Argonaut Fuse"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Serviços"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr "Importação completa: %s eventos enviados corretamente, %s falharam"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Bandeiras fai"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "arquivo está vazio"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
-msgstr "Raiz NFS"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr "MAC"
 
-#: 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 "Servidor Argonaut"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr "Não foi possível carregar as entradas queue: %s"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
-msgstr "Deletar tarefas finalizadas"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr "Cliente Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
-msgstr "O servidor Argonaut deve deletar ou não as tarefas finalizadas com sucesso."
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr "Editar configurações de cliente argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
-msgstr ""
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr "Configurações de cliente Argonaut"
 
-#: 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/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr "Porta do cliente"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Porta"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
+msgstr "Porta usado pelo cliente argonaut para JSON-RPC"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
-msgstr "Porta onde o servidor argonauta estará escutando"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr "Protocolo"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "Tempo limite"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
+msgstr "Protocolo usado pelo argonaut"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
-msgstr "Tempo em segundos antes de considerar o servidor ou cliente argonaut caídos."
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
+msgstr "Interface WakeOnLan"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
-msgstr "Diretório onde o Argonaut armazenará seu registro"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
+msgstr "Interface usada pelo argonaut para WakeOnLan"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
-msgstr "Lan disponível"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
+msgstr "Arquivo TaskId"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
-msgstr "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr "Arquivo o qual argonaut usará para armazenar sua task id quando inicializar"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
-msgstr "Interface a ser usada para o envio de solicitações WakeOnLan"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
+msgstr "Diretório de registro"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
-msgstr "Ferramenta de IP"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
+msgstr "Diretório o qual o cliente argonaut deve escrever seus registros"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
-msgstr "Ferramento de IP para usar"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
+msgstr ""
 
+#: admin/systems/argonaut/class_argonautClient.inc:164
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+msgid "Key"
+msgstr "Chave"
+
+#: 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
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+msgid "Certificate"
+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
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+msgid "CA certificate"
+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
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+msgid "CN of the certificate"
 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 "Nomes dos Serviços"
+
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
+msgstr "Nome dos serviços Argonaut"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Serviços"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr "OPSI"
@@ -373,6 +443,23 @@ 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
+msgid "Argonaut Fuse FAI module settings"
+msgstr "Módulos de configuração FAI do Argonaut Fuse"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr "Bandeiras fai"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr "Raiz NFS"
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -447,292 +534,206 @@ msgstr "LTSP"
 msgid "LTSP server"
 msgstr "Servidor LTSP"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Desligue"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Reiniciar"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "Acordar"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr "Atualização de software"
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr "(Re)Instalar"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Erro"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-msgstr "Não foi possível carregar as entradas queue: %s"
-
-#: 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 "Upload"
-
-#: 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:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Importar"
-
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
-msgstr ""
-
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
-msgstr "Importação completa: %s eventos enviados corretamente, %s falharam"
-
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "arquivo está vazio"
-
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
-msgstr "MAC"
-
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
-msgstr "Evento"
-
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
-msgstr "Fila de implantação"
-
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Prover um mecanismo para ativar os sistemas automaticamente"
-
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Permissão"
-
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Remover"
-
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Os trabalhos seguintes não puderam ser deletados, tivemos que abortar: %s"
-
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
-msgstr "Informações"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
+msgstr "Configurações Argonaut Fuse"
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
-msgstr "%s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
+msgstr "Configurações básicas"
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
-msgstr "Detalhes do erro"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr "Modo padrão"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "Não foi possível atualizar a fila de entradas"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr "Diretório o qual argonaut-fuse irá armazenar seu registro"
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
-msgstr "Imediatamente"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr "TFTP"
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
-msgstr "Esperando"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr "Pxelinux cfg path"
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
-msgstr "Mostrar erro"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
+msgstr "Pacote onde argonaut-fuse devera armazenar pxelinux.cfg"
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
-msgstr "Processado"
+#: 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 "Servidor Argonaut"
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
-msgstr "em progresso"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr "Deletar tarefas finalizadas"
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
-msgstr "Lista de filas de trabalho"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
+msgstr "O servidor Argonaut deve deletar ou não as tarefas finalizadas com sucesso."
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
-msgstr "Destino"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Tarefa"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
-msgstr "Período"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Porta"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
-msgstr "Programação"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr "Porta onde o servidor argonauta estará escutando"
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Estado"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "Tempo limite"
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Ações"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr "Tempo em segundos antes de considerar o servidor ou cliente argonaut caídos."
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Abortar"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr "Diretório onde o Argonaut armazenará seu registro"
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Executar"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr "Lan disponível"
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
-msgstr "Processar agora"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr "Interface"
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
-msgstr "Ver registros"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr "Interface a ser usada para o envio de solicitações WakeOnLan"
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
-msgstr "Horas"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr "Ferramenta de IP"
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
-msgstr "Minutos"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr "Ferramento de IP para usar"
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Data"
-
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
-msgstr "Trabalho periódico"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr "Configurações Argonaut Mirror"
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr "Configurações mirror do Argonaut"
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
-msgstr "Dias"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr "Configuração Argonaut Debconf Crawler"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
-msgstr "Semanas"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr "Paste de pacotes locais"
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
-msgstr "Meses"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
+msgstr "Pasta onde o rastreador armazenará os pacotes durante a análise"
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
+msgstr "Configuração de repositório Argonaut"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
-msgstr "Servidores múltiplos argonaut encontrados. Apenas um é suportado"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
-msgstr "Este não é um servidor argonaut configurado"
+#: 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 ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr "Fonte"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr "Verifique GPG"
+
+#: 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 "Conteúdo"
+
+#: 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 "Verbose"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
+msgstr "Aperte para ativar o modo detalhado"
+
 #: addons/argonaut/import_events.tpl.c:2
 msgid ""
 "You can import a list of jobs into the FusionDirectory job queue. This "
diff --git a/argonaut/locale/ru/fusiondirectory.po b/argonaut/locale/ru/fusiondirectory.po
index 8eb0be9b18..7e0efbc636 100644
--- a/argonaut/locale/ru/fusiondirectory.po
+++ b/argonaut/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 20:45+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
-msgstr "Протокол"
-
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Права"
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: 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 ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Ошибка"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "Выключить"
+
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "Перезагрузить"
+
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "Вернуть в обычный режим"
+
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
+msgstr "Обновить программное обеспечение"
+
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: 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 ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Состояние"
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Действия"
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Прокси-сервер"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Загрузить"
+
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "Источник"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "файл пустой"
+
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr "MAC"
+
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 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)"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Сервисы"
-
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
-
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
-msgstr ""
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr "Протокол"
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:31
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautServer.inc:46
-msgid "Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Порт"
-
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Сервисы"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr "OPSI"
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -427,310 +514,224 @@ msgid "Time to live"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "Выключить"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "Перезагрузить"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "Вернуть в обычный режим"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr "Обновить программное обеспечение"
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Ошибка"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "Импортировать"
-
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
-msgstr ""
-
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "файл пустой"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
+msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
-msgstr "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
+msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Права"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Удалить"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: 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 ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Состояние"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Действия"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Прервать"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Выполнить"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
-msgstr "Минуты"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
-msgstr "Секунды"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "Дата"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: 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 ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: 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 ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/ru@petr1708/fusiondirectory.po b/argonaut/locale/ru@petr1708/fusiondirectory.po
index e843089486..c410d079e9 100644
--- a/argonaut/locale/ru@petr1708/fusiondirectory.po
+++ b/argonaut/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+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_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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -409,328 +496,242 @@ msgstr ""
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:67
 msgid "Allow notify"
 msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
-msgid "Allow update (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
+msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/sv/fusiondirectory.po b/argonaut/locale/sv/fusiondirectory.po
index 92392c6f0e..454ec58fc6 100644
--- a/argonaut/locale/sv/fusiondirectory.po
+++ b/argonaut/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
-msgstr "Argonaut-klient"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Rättighet"
+
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Ta bort"
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Fel"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
-msgstr "Nyckel"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
+msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr "Åtgärd"
+
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Status"
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Åtgärder"
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Avbryt"
+
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "Exekvera"
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Innehåll"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "Ladda upp"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
-msgstr ""
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
+msgstr "filen är tom"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "Tjänster"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr "Argonaut-klient"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
+msgstr "Nyckel"
+
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "Tjänster"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr "OPSI"
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -423,314 +510,228 @@ msgid "TTL"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Fel"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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 "Ladda upp"
-
-#: 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:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
-msgstr "filen är tom"
-
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Rättighet"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Ta bort"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr "Port"
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "Åtgärd"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Åtgärder"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Avbryt"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "Exekvera"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Innehåll"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/ug/fusiondirectory.po b/argonaut/locale/ug/fusiondirectory.po
index c85f4e68e3..47cf588a1e 100644
--- a/argonaut/locale/ug/fusiondirectory.po
+++ b/argonaut/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:31+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+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_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 ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -409,328 +496,242 @@ msgstr ""
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:67
 msgid "Allow notify"
 msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
-msgid "Allow update (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
-msgid "Allow transfer (semicolon separated and ended)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
+msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:53
-msgid "Import a list of task into argonaut"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:63
-msgid "Upload"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:67
-msgid "Import file"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:72
-msgid "Imported tasks"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/vi_VN/fusiondirectory.po b/argonaut/locale/vi_VN/fusiondirectory.po
index 3c7069faa1..610e448c2a 100644
--- a/argonaut/locale/vi_VN/fusiondirectory.po
+++ b/argonaut/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "Cho phép"
+
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr "Xóa bỏ"
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "Lá»—i"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "Proxy"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr "Trạng thái"
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr "Các thao tác"
+
+#: addons/argonaut/deploy-list.xml:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr "Ngừng lại"
+
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: 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:121
+msgid "Fix the errors in your CSV file first"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "Ná»™i dung"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -419,318 +506,232 @@ msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "Lá»—i"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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"
+msgid "TTL"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:93
-msgid "Permission"
-msgstr "Cho phép"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:123
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
-msgid "Remove"
-msgstr "Xóa bỏ"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:124
-#, php-format
-msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "Trạng thái"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "Các thao tác"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
-msgstr "Ngừng lại"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr "Proxy"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr "Ná»™i dung"
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
 msgstr ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
 msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/argonaut/locale/zh/fusiondirectory.po b/argonaut/locale/zh/fusiondirectory.po
index 079c4fa9fb..96a4b7dda2 100644
--- a/argonaut/locale/zh/fusiondirectory.po
+++ b/argonaut/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,335 +17,397 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/argonaut/class_argonautClient.inc:117
-msgid "Argonaut client"
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:118
-msgid "Edit argonaut client settings"
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:131
-msgid "Argonaut client settings"
+#: include/class_supportDaemon.inc:600
+#, php-format
+msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Client port"
+#: include/class_supportDaemon.inc:604
+#, php-format
+msgid "\"%s\" is not a file!"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:134
-msgid "Port used by argonaut client for JSON-RPC"
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol"
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:139
-#: admin/systems/services/argonaut/class_argonautServer.inc:61
-msgid "Protocol to use for argonaut"
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr "允许"
+
+#: 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 ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "WakeOnLan interface"
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Info"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:144
-msgid "Interface used by argonaut for WakeOnLan"
+#: addons/argonaut/class_argonautQueue.inc:189
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "TaskId file"
+#: addons/argonaut/class_argonautQueue.inc:219
+msgid "Error detail"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:149
-msgid "File which argonaut will use to store its task id when booting"
+#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr "错误"
+
+#: addons/argonaut/class_argonautQueue.inc:261
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-#: admin/systems/services/argonaut/class_argonautServer.inc:79
-msgid "Log directory"
+#: addons/argonaut/class_argonautQueue.inc:329
+msgid "immediately"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:154
-msgid "Directory in which argonaut client should write its logs"
+#: addons/argonaut/class_argonautQueue.inc:341
+msgid "Waiting"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:161
-#: admin/systems/services/argonaut/class_argonautServer.inc:103
-msgid "SSL paths"
+#: addons/argonaut/class_argonautQueue.inc:344
+msgid "Show error"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Key"
+#: addons/argonaut/class_argonautQueue.inc:348
+msgid "Processed"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:164
-msgid "Path to the private key file on Argonaut client"
+#: addons/argonaut/class_argonautQueue.inc:357
+msgid "in progress"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Certificate"
+#: addons/argonaut/class_argonautEventTypes.inc:72
+msgid "Switch off"
+msgstr "关闭"
+
+#: addons/argonaut/class_argonautEventTypes.inc:85
+msgid "Reboot"
+msgstr "重启"
+
+#: addons/argonaut/class_argonautEventTypes.inc:89
+msgid "Wake up"
+msgstr "唤醒"
+
+#: addons/argonaut/class_argonautEventTypes.inc:93
+msgid "Software update"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:169
-msgid "Path to the certificate file on Argonaut client"
+#: addons/argonaut/class_argonautEventTypes.inc:97
+msgid "(Re)Install"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "CA certificate"
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:174
-msgid "Path to the CA certificate file on Argonaut client"
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "CN of the certificate"
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:179
-msgid "The CN in this client certificate"
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr "日期"
+
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:185
-msgid "Service names"
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
 msgstr ""
 
-#: admin/systems/argonaut/class_argonautClient.inc:187
-msgid "Argonaut service names"
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
-msgid "Argonaut Fuse"
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
-msgid "Argonaut Fuse settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
-msgid "Basic settings"
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
-msgid "Default mode"
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-msgid "Directory in which argonaut-fuse will store its log"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
-msgid "TFTP"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
-msgid "Pxelinux cfg path"
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
-msgid "Path where argonaut-fuse should store pxelinux.cfg"
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
-msgid "Argonaut Mirror settings"
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
-msgid "Argonaut mirror settings"
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
-msgid "Argonaut Debconf Crawler configuration"
+#: addons/argonaut/deploy-list.xml:14
+#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/import_events.tpl.c:26
+msgid "Event"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
-msgid "Local packages folder"
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
-msgid "Folder in which the crawler will store packages during analysis"
+#: 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:79
+#: addons/argonaut/class_argonautImportFile.inc:96
+#: addons/argonaut/class_argonautImportFile.inc:120
+#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "Import"
+msgstr "导入"
+
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
-msgid "Argonaut Repository configuration"
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr "执行"
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
-msgid "Proxy"
-msgstr "代理"
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Source"
-msgstr "源"
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr "上传"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "GPG Check"
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
+#: addons/argonaut/class_argonautImportFile.inc:121
+msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
-msgid "Contents"
-msgstr "内容"
+#: addons/argonaut/class_argonautImportFile.inc:137
+msgid "Infrastructure service"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
+#: addons/argonaut/class_argonautImportFile.inc:144
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:156
+msgid "file is empty"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Verbose"
+#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
-msgid "Wether to activate verbose mode"
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-msgid "Argonaut Fuse FAI module settings"
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautServer.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
-#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
-msgid "Services"
-msgstr "服务"
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
-msgid "FAI"
-msgstr "自动化安装"
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
-msgid "NFS root"
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
 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"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:49
-msgid "Delete finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:139
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:50
-msgid ""
-"Wether or not argonaut server should delete successfully finished tasks"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:55
-msgid "Get packages informations"
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
 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."
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:66
-msgid "Port"
-msgstr "端口"
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:67
-msgid "Port on which the argonaut server will be listening"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Log directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:72
-msgid "Timeout"
-msgstr "过期"
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:73
-msgid ""
-"Time in seconds before to consider an argonaut client or server as down"
+#: admin/systems/argonaut/class_argonautClient.inc:161
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+msgid "SSL paths"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:80
-msgid "Directory in which argonaut will store its log"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Key"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:87
-msgid "Wake on lan"
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:90
-msgid "Interface"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:91
-msgid "Interface to use for sending WakeOnLan requests"
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "CA certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:96
-msgid "IP tool to use"
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:106
-msgid "Path to the private key file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "CN of the certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:111
-msgid "Path to the certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:116
-msgid "Path to the CA certificate file on Argonaut server"
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautServer.inc:121
-msgid "The CN in the server certificate"
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
@@ -353,6 +415,14 @@ msgstr ""
 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_argonautDNSConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Services"
+msgstr "服务"
+
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
 msgstr ""
@@ -373,6 +443,23 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+msgid "FAI"
+msgstr "自动化安装"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Fai flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+msgid "NFS root"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
 msgid "Argonaut DNS settings"
@@ -423,314 +510,228 @@ msgid "TTL"
 msgstr "TTL"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:86
-msgid "Time to live"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
-msgid "rndc path"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
-msgid "path to rndc binary"
-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 ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:72
-msgid "Switch off"
-msgstr "关闭"
-
-#: addons/argonaut/class_argonautEventTypes.inc:85
-msgid "Reboot"
-msgstr "重启"
-
-#: addons/argonaut/class_argonautEventTypes.inc:89
-msgid "Wake up"
-msgstr "唤醒"
-
-#: addons/argonaut/class_argonautEventTypes.inc:93
-msgid "Software update"
-msgstr ""
-
-#: addons/argonaut/class_argonautEventTypes.inc:97
-msgid "(Re)Install"
-msgstr ""
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
-#: addons/argonaut/import_events.tpl.c:32
-msgid "Error"
-msgstr "错误"
-
-#: addons/argonaut/class_filterArgonautEvents.inc:39
-#, php-format
-msgid "Cannot load queue entries: %s"
-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:96
-#: addons/argonaut/class_argonautImportFile.inc:120
-#: addons/argonaut/class_argonautImportFile.inc:144
-#: addons/argonaut/class_argonautImportFile.inc:156
-#: addons/argonaut/deploy-list.xml:79
-msgid "Import"
-msgstr "导入"
-
-#: addons/argonaut/class_argonautImportFile.inc:121
-msgid "Fix the errors in your CSV file first"
+msgid "Time to live"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
-msgid "Infrastructure service"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:94
+msgid "rndc path"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
-#, php-format
-msgid "Import complete: %s events successfully send, %s failed"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:95
+msgid "path to rndc binary"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
-msgid "file is empty"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
-#: addons/argonaut/import_events.tpl.c:23
-msgid "MAC"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:184
-#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
-msgid "Event"
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:41
-#: addons/argonaut/class_argonautQueue.inc:46
-#: addons/argonaut/class_argonautQueue.inc:49
-msgid "Deployment queue"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:42
-msgid "Provide a mechanism to automatically activate systems"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
 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"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-msgid "Info"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
-#, php-format
-msgid "%s"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
-msgid "Error detail"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#, php-format
-msgid "Cannot update queue entries."
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
-msgid "immediately"
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
-msgid "Waiting"
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
-msgid "Show error"
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
-msgid "Processed"
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
-msgid "in progress"
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:10
-msgid "List of queued jobs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:27
-msgid "Target"
+#: 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 ""
 
-#: addons/argonaut/deploy-list.xml:35
-msgid "Task"
-msgstr "任务"
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr "过期"
 
-#: addons/argonaut/deploy-list.xml:43
-#: addons/argonaut/class_argonautAction.inc:132
-msgid "Period"
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/class_argonautAction.inc:97
-#: addons/argonaut/class_argonautAction.inc:107
-msgid "Schedule"
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-msgid "Status"
-msgstr "状态"
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
-msgid "Actions"
-msgstr "动作"
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
-msgid "Abort"
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
-msgid "Execute"
-msgstr "执行"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
-msgid "Process now"
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
-msgid "View logs"
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:27
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Hours"
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:32
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Minutes"
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:37
-msgid "Seconds"
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:53
-msgid "Date"
-msgstr "日期"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:58
-msgid "Time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:81
-#: addons/argonaut/class_argonautAction.inc:84
-msgid "Argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:82
-msgid "Schedule an argonaut task"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Periodical job"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:111
-msgid "Wether this job should repeat in time"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:115
-msgid "How often this task should be repeated"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Days"
+#: 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 ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Weeks"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:126
-msgid "Months"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:137
-msgid "Targets"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
 msgstr ""
 
-#: addons/argonaut/class_argonautAction.inc:140
-msgid "Targets for this task"
+#: 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 ""
 
-#: include/class_supportDaemon.inc:107
-msgid "Multiple argonaut server found. Only one is supported"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
 msgstr ""
 
-#: include/class_supportDaemon.inc:109
-msgid "There is no argonaut server configured"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
 msgstr ""
 
-#: include/class_supportDaemon.inc:600
-#, php-format
-msgid "Could not read \"%s\"!"
+#: 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 ""
 
-#: include/class_supportDaemon.inc:604
-#, php-format
-msgid "\"%s\" is not a file!"
+#: 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 ""
 
 #: addons/argonaut/import_events.tpl.c:2
diff --git a/audit/locale/ar/fusiondirectory.po b/audit/locale/ar/fusiondirectory.po
index ba7812c4a1..ff9caa6b94 100644
--- a/audit/locale/ar/fusiondirectory.po
+++ b/audit/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "النوع"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/ca/fusiondirectory.po b/audit/locale/ca/fusiondirectory.po
index ed0620c57d..51105076de 100644
--- a/audit/locale/ca/fusiondirectory.po
+++ b/audit/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr ""
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/cs_CZ/fusiondirectory.po b/audit/locale/cs_CZ/fusiondirectory.po
index b86b7e7635..dcb947d4f1 100644
--- a/audit/locale/cs_CZ/fusiondirectory.po
+++ b/audit/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Typ"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr "Cíl"
-
-#: 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/de/fusiondirectory.po b/audit/locale/de/fusiondirectory.po
index 0eb068bcab..57ab1f30a8 100644
--- a/audit/locale/de/fusiondirectory.po
+++ b/audit/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Typ"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr "Ziel"
-
-#: 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/el_GR/fusiondirectory.po b/audit/locale/el_GR/fusiondirectory.po
index 9313e53937..53cf9d7dc8 100644
--- a/audit/locale/el_GR/fusiondirectory.po
+++ b/audit/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Τύπος"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/es/fusiondirectory.po b/audit/locale/es/fusiondirectory.po
index d9e9e38a76..d6adbf8b69 100644
--- a/audit/locale/es/fusiondirectory.po
+++ b/audit/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Tipo"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr "Objetivo"
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/es_CO/fusiondirectory.po b/audit/locale/es_CO/fusiondirectory.po
index 6b90cc61b5..65071851cc 100644
--- a/audit/locale/es_CO/fusiondirectory.po
+++ b/audit/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Tipo"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/es_VE/fusiondirectory.po b/audit/locale/es_VE/fusiondirectory.po
index ad3cc77f9a..01613eb28a 100644
--- a/audit/locale/es_VE/fusiondirectory.po
+++ b/audit/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Tipo"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr "Objetivo"
-
-#: 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/fa_IR/fusiondirectory.po b/audit/locale/fa_IR/fusiondirectory.po
index b8bb72f279..4ad9939c16 100644
--- a/audit/locale/fa_IR/fusiondirectory.po
+++ b/audit/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr ""
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/fi_FI/fusiondirectory.po b/audit/locale/fi_FI/fusiondirectory.po
index 66c8361b42..994cad6ca8 100644
--- a/audit/locale/fi_FI/fusiondirectory.po
+++ b/audit/locale/fi_FI/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-01 11:49+0000\n"
 "Last-Translator: Dina Solveig Jalkanen\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -19,6 +19,43 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr "Audit RDN"
+
+#: 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 "Säilytä päivät"
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -86,11 +123,6 @@ msgstr "Lopputulos"
 msgid "Result or error"
 msgstr "Lopputulos tai virhe"
 
-#: 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 ""
@@ -102,35 +134,3 @@ msgstr "Tyyppi"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr "Määränpää"
-
-#: 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 "Audit RDN"
-
-#: 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 "Säilytä päivät"
-
-#: 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/fr/fusiondirectory.po b/audit/locale/fr/fusiondirectory.po
index f42c75c74c..207ca079dc 100644
--- a/audit/locale/fr/fusiondirectory.po
+++ b/audit/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,6 +18,43 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr "Configuration audit"
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr "Configuration du plugin audit"
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr "Audit"
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr "Branche Audit"
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr "Branche dans laquelle les événements d'audit sont stockés"
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr "Actions à auditer"
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr "Quelles actions doivent être stockés dans journal d'audit"
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr "Durée de rentention"
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr "Nombre de jours d'audit à conserver dans le LDAP lors du nettoyage"
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr "Événement d'audit"
@@ -85,11 +122,6 @@ msgstr "Résultat"
 msgid "Result or error"
 msgstr "Résultat ou erreur"
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr "Audit"
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr "Événement d'audit"
@@ -101,35 +133,3 @@ msgstr "Type"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr "Cible"
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr "Configuration audit"
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr "Configuration du plugin audit"
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr "Branche Audit"
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr "Branche dans laquelle les événements d'audit sont stockés"
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr "Actions à auditer"
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr "Quelles actions doivent être stockés dans journal d'audit"
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr "Durée de rentention"
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr "Nombre de jours d'audit à conserver dans le LDAP lors du nettoyage"
diff --git a/audit/locale/hu_HU/fusiondirectory.po b/audit/locale/hu_HU/fusiondirectory.po
index 0eafe46e29..bc93d51e17 100644
--- a/audit/locale/hu_HU/fusiondirectory.po
+++ b/audit/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr ""
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/id/fusiondirectory.po b/audit/locale/id/fusiondirectory.po
index 69380a4a85..897afd9d33 100644
--- a/audit/locale/id/fusiondirectory.po
+++ b/audit/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr ""
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/it_IT/fusiondirectory.po b/audit/locale/it_IT/fusiondirectory.po
index 7928f54b5f..078873f8c5 100644
--- a/audit/locale/it_IT/fusiondirectory.po
+++ b/audit/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:19+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -18,6 +18,43 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr "Configurazione di audit"
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr "Configurazione del plugin di controllo di FusionDirectory"
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr "Controllo"
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr "Controllo RDN"
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr "Ramo nel quale gli eventi di controllo verranno immagazzinati"
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr "Azioni da controllare"
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr "Quali azioni devono essere conservati nel log di controllo LDAP"
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr "Giorni di conservazione"
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr "Numero di giorni di controllo da tenere nell'LDAP durante il cleaning"
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr "Evento di controllo"
@@ -85,11 +122,6 @@ msgstr "Risultato"
 msgid "Result or error"
 msgstr "Risultato o errore"
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr "Controllo"
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr "Visualizzazione eventi di controllo"
@@ -101,35 +133,3 @@ msgstr "Tipo"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr "Obiettivo"
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr "Configurazione di audit"
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr "Configurazione del plugin di controllo di FusionDirectory"
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr "Controllo RDN"
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr "Ramo nel quale gli eventi di controllo verranno immagazzinati"
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr "Azioni da controllare"
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr "Quali azioni devono essere conservati nel log di controllo LDAP"
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr "Giorni di conservazione"
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr "Numero di giorni di controllo da tenere nell'LDAP durante il cleaning"
diff --git a/audit/locale/lv/fusiondirectory.po b/audit/locale/lv/fusiondirectory.po
index 1beb38ba86..1baf131c57 100644
--- a/audit/locale/lv/fusiondirectory.po
+++ b/audit/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Veids"
 #: 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/nb/fusiondirectory.po b/audit/locale/nb/fusiondirectory.po
index e2c4e83a2b..13a97be989 100644
--- a/audit/locale/nb/fusiondirectory.po
+++ b/audit/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr ""
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/nl/fusiondirectory.po b/audit/locale/nl/fusiondirectory.po
index 6dc63db976..c582de9cc6 100644
--- a/audit/locale/nl/fusiondirectory.po
+++ b/audit/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Type"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr "Doel"
-
-#: 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/pl/fusiondirectory.po b/audit/locale/pl/fusiondirectory.po
index fc305459e0..56b81b771d 100644
--- a/audit/locale/pl/fusiondirectory.po
+++ b/audit/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Typ"
 #: 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/pt/fusiondirectory.po b/audit/locale/pt/fusiondirectory.po
index a4cde5dcac..4335a9de42 100644
--- a/audit/locale/pt/fusiondirectory.po
+++ b/audit/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Tipo"
 #: 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/pt_BR/fusiondirectory.po b/audit/locale/pt_BR/fusiondirectory.po
index 057a25e6d0..2f86817a76 100644
--- a/audit/locale/pt_BR/fusiondirectory.po
+++ b/audit/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Tipo"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr "Destino"
-
-#: 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/ru/fusiondirectory.po b/audit/locale/ru/fusiondirectory.po
index 600f84d356..ae5599461e 100644
--- a/audit/locale/ru/fusiondirectory.po
+++ b/audit/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-12 06:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Тип"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/ru@petr1708/fusiondirectory.po b/audit/locale/ru@petr1708/fusiondirectory.po
index 330643f0bc..e6f32cf624 100644
--- a/audit/locale/ru@petr1708/fusiondirectory.po
+++ b/audit/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr ""
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/sv/fusiondirectory.po b/audit/locale/sv/fusiondirectory.po
index feed925e2e..e402bae24b 100644
--- a/audit/locale/sv/fusiondirectory.po
+++ b/audit/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Typ"
 #: 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/ug/fusiondirectory.po b/audit/locale/ug/fusiondirectory.po
index 87534c1b2d..ca190b576e 100644
--- a/audit/locale/ug/fusiondirectory.po
+++ b/audit/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr ""
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/audit/locale/vi_VN/fusiondirectory.po b/audit/locale/vi_VN/fusiondirectory.po
index ebf54065a2..573024c8d1 100644
--- a/audit/locale/vi_VN/fusiondirectory.po
+++ b/audit/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "Loại"
 #: 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/zh/fusiondirectory.po b/audit/locale/zh/fusiondirectory.po
index 97c05cd325..ac0223db47 100644
--- a/audit/locale/zh/fusiondirectory.po
+++ b/audit/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:41
+#: admin/audit/class_auditManagement.inc:40
+msgid "Audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
+
 #: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
 msgid "Audit event"
 msgstr ""
@@ -84,11 +121,6 @@ msgstr ""
 msgid "Result or error"
 msgstr ""
 
-#: admin/audit/class_auditManagement.inc:40
-#: config/audit/class_auditConfig.inc:41
-msgid "Audit"
-msgstr ""
-
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
 msgstr ""
@@ -100,35 +132,3 @@ msgstr "类型"
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
 msgstr ""
-
-#: config/audit/class_auditConfig.inc:28
-msgid "Audit configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:29
-msgid "FusionDirectory audit plugin configuration"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Audit RDN"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:44
-msgid "Branch in which audit events will be stored"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Actions to audit"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:50
-msgid "Which actions should be stored in LDAP audit log"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Days to keep"
-msgstr ""
-
-#: config/audit/class_auditConfig.inc:57
-msgid "Number of days of audit to keep in the LDAP when cleaning"
-msgstr ""
diff --git a/autofs/locale/ar/fusiondirectory.po b/autofs/locale/ar/fusiondirectory.po
index 03422344e7..a50f4dcf25 100644
--- a/autofs/locale/ar/fusiondirectory.po
+++ b/autofs/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/ca/fusiondirectory.po b/autofs/locale/ca/fusiondirectory.po
index c5786316c5..a149406a03 100644
--- a/autofs/locale/ca/fusiondirectory.po
+++ b/autofs/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/cs_CZ/fusiondirectory.po b/autofs/locale/cs_CZ/fusiondirectory.po
index 0a5fb1a295..8be36ae4b7 100644
--- a/autofs/locale/cs_CZ/fusiondirectory.po
+++ b/autofs/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr "Nastavení Autofs"
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr "Nastavení zásuvného modulu autofs pro FusionDirectory"
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr "AutoFS"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr "Relativní rozlišený název AutoFS"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr "Větev, ve které budou ukládány údaje pro automatické připojování souborových systémů"
+
 #: 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"
@@ -49,14 +69,6 @@ msgstr "Přípojný bod"
 msgid "The mount point this directory will be placed in"
 msgstr "Přípojný bod, do kterého bude tato složka umístěna"
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr "Přípojný bod pro autofs"
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr "Název přípojného bodu"
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr "Správa auto fs"
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr "Nastavení Autofs"
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr "Nastavení zásuvného modulu autofs pro FusionDirectory"
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr "AutoFS"
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
-msgstr "Relativní rozlišený název AutoFS"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
+msgstr "Přípojný bod pro autofs"
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
-msgstr "Větev, ve které budou ukládány údaje pro automatické připojování souborových systémů"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
+msgstr "Název přípojného bodu"
diff --git a/autofs/locale/de/fusiondirectory.po b/autofs/locale/de/fusiondirectory.po
index 8355809511..881e9b8b0b 100644
--- a/autofs/locale/de/fusiondirectory.po
+++ b/autofs/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr "Autofs Konfiguration"
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr "FusionDirectory autofs Plugin  Konfiguration"
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr "AutoFS"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr "AutoFS RDN"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr "Zweig in welchem automount info gespeichert wird"
+
 #: 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"
@@ -50,14 +70,6 @@ msgstr "Einhänge-Pfad"
 msgid "The mount point this directory will be placed in"
 msgstr "Der Mountpoint dieses Verzeichnisses wird plaziert in"
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr "Autofs mount point"
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr "Name des Mountpoints"
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr "Auto fs"
@@ -66,22 +78,10 @@ msgstr "Auto fs"
 msgid "Auto fs management"
 msgstr "Auto fs Verwaltung"
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr "Autofs Konfiguration"
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr "FusionDirectory autofs Plugin  Konfiguration"
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr "AutoFS"
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
-msgstr "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
+msgstr "Autofs mount point"
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
-msgstr "Zweig in welchem automount info gespeichert wird"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
+msgstr "Name des Mountpoints"
diff --git a/autofs/locale/el_GR/fusiondirectory.po b/autofs/locale/el_GR/fusiondirectory.po
index 87842c062a..bfa5fa0a5f 100644
--- a/autofs/locale/el_GR/fusiondirectory.po
+++ b/autofs/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr "Ρύθμιση Auto fs "
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory autofs"
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr "AutoFS"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr "AutoFS RDN"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr "Κλάδος στον οποίο θα αποθηκεύονται πληροφορίες automount"
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -50,14 +70,6 @@ msgstr "Σημείο προσάρτησης"
 msgid "The mount point this directory will be placed in"
 msgstr "Το σημείο προσάρτησης αυτού του καταλόγου θα τοποθετηθεί"
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr "Σημείο προσάρτησης Autofs"
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr "Το όνομα του σημείου προσάρτησης"
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr "Auto fs"
@@ -66,22 +78,10 @@ msgstr "Auto fs"
 msgid "Auto fs management"
 msgstr "Διαχείριση Auto fs "
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr "Ρύθμιση Auto fs "
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory autofs"
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr "AutoFS"
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
-msgstr "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
+msgstr "Σημείο προσάρτησης Autofs"
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
-msgstr "Κλάδος στον οποίο θα αποθηκεύονται πληροφορίες automount"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
+msgstr "Το όνομα του σημείου προσάρτησης"
diff --git a/autofs/locale/es/fusiondirectory.po b/autofs/locale/es/fusiondirectory.po
index 5a86230a72..feb165b367 100644
--- a/autofs/locale/es/fusiondirectory.po
+++ b/autofs/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr "Punto de montaje"
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/es_CO/fusiondirectory.po b/autofs/locale/es_CO/fusiondirectory.po
index 74fa336bf4..34e8e4b4fb 100644
--- a/autofs/locale/es_CO/fusiondirectory.po
+++ b/autofs/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/es_VE/fusiondirectory.po b/autofs/locale/es_VE/fusiondirectory.po
index 775cfa7952..13b76c1846 100644
--- a/autofs/locale/es_VE/fusiondirectory.po
+++ b/autofs/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr "Punto de montaje"
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/fa_IR/fusiondirectory.po b/autofs/locale/fa_IR/fusiondirectory.po
index 9cca590c31..c7631185a9 100644
--- a/autofs/locale/fa_IR/fusiondirectory.po
+++ b/autofs/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/fi_FI/fusiondirectory.po b/autofs/locale/fi_FI/fusiondirectory.po
index fd338e4e35..ec0a925f52 100644
--- a/autofs/locale/fi_FI/fusiondirectory.po
+++ b/autofs/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr "Autofs asetukset"
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr "AutoFS"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr "AutoFS RDN"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr "Auto fs"
@@ -65,22 +77,10 @@ msgstr "Auto fs"
 msgid "Auto fs management"
 msgstr "Auto fs hallinta"
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr "Autofs asetukset"
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr "AutoFS"
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
-msgstr "AutoFS RDN"
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/fr/fusiondirectory.po b/autofs/locale/fr/fusiondirectory.po
index e2f27d6f95..a483e42376 100644
--- a/autofs/locale/fr/fusiondirectory.po
+++ b/autofs/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr "Configuration Autofs"
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr "Configuration du plugin autofs"
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr "AutoFS"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr "Branche Autofs"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr "Branche où seront stockés les points de montage automount"
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -50,14 +70,6 @@ msgstr "Point de montage"
 msgid "The mount point this directory will be placed in"
 msgstr "Le point de montage dans lequel ce répertoire sera mis"
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr "Point de montage Autofs"
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr "Nom du point de montage"
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr "Auto fs"
@@ -66,22 +78,10 @@ msgstr "Auto fs"
 msgid "Auto fs management"
 msgstr "Gestion Autofs"
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr "Configuration Autofs"
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr "Configuration du plugin autofs"
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr "AutoFS"
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
-msgstr "Branche Autofs"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
+msgstr "Point de montage Autofs"
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
-msgstr "Branche où seront stockés les points de montage automount"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
+msgstr "Nom du point de montage"
diff --git a/autofs/locale/hu_HU/fusiondirectory.po b/autofs/locale/hu_HU/fusiondirectory.po
index c61c181dc4..56c028970d 100644
--- a/autofs/locale/hu_HU/fusiondirectory.po
+++ b/autofs/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/id/fusiondirectory.po b/autofs/locale/id/fusiondirectory.po
index 0155fd967c..9ff2cc5e73 100644
--- a/autofs/locale/id/fusiondirectory.po
+++ b/autofs/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/it_IT/fusiondirectory.po b/autofs/locale/it_IT/fusiondirectory.po
index f642c93bd6..84a61cfb9b 100644
--- a/autofs/locale/it_IT/fusiondirectory.po
+++ b/autofs/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:20+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,6 +19,26 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr "Configurazione di Autofs"
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr "Configurazione del plugin Autofs di FusionDirectory"
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr "AutoFS"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr "RDN Autofs"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr "Ramo nel quale saranno immagazzinate le informazioni relative ad automount"
+
 #: 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"
@@ -51,14 +71,6 @@ msgstr "Punto di montaggio"
 msgid "The mount point this directory will be placed in"
 msgstr "Il punto di montaggio in cui sarà posta questa cartella"
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr "Punto di montaggio Autofs"
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr "Nome del punto di montaggio"
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr "Auto fs"
@@ -67,22 +79,10 @@ msgstr "Auto fs"
 msgid "Auto fs management"
 msgstr "Gestione di Auto fs"
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr "Configurazione di Autofs"
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr "Configurazione del plugin Autofs di FusionDirectory"
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr "AutoFS"
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
-msgstr "RDN Autofs"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
+msgstr "Punto di montaggio Autofs"
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
-msgstr "Ramo nel quale saranno immagazzinate le informazioni relative ad automount"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
+msgstr "Nome del punto di montaggio"
diff --git a/autofs/locale/lv/fusiondirectory.po b/autofs/locale/lv/fusiondirectory.po
index b3b212fccb..84022fc600 100644
--- a/autofs/locale/lv/fusiondirectory.po
+++ b/autofs/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/nb/fusiondirectory.po b/autofs/locale/nb/fusiondirectory.po
index ac4324659b..040fcb7cec 100644
--- a/autofs/locale/nb/fusiondirectory.po
+++ b/autofs/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/nl/fusiondirectory.po b/autofs/locale/nl/fusiondirectory.po
index 26d7181091..332cb17749 100644
--- a/autofs/locale/nl/fusiondirectory.po
+++ b/autofs/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr "Koppelpunt"
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/pl/fusiondirectory.po b/autofs/locale/pl/fusiondirectory.po
index 8343c19678..8b3ce372b9 100644
--- a/autofs/locale/pl/fusiondirectory.po
+++ b/autofs/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr "Punkt montowania"
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/pt/fusiondirectory.po b/autofs/locale/pt/fusiondirectory.po
index 7fea7a1913..1389c572dd 100644
--- a/autofs/locale/pt/fusiondirectory.po
+++ b/autofs/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/pt_BR/fusiondirectory.po b/autofs/locale/pt_BR/fusiondirectory.po
index 1999b78a0c..dd04ad5a8e 100644
--- a/autofs/locale/pt_BR/fusiondirectory.po
+++ b/autofs/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr "Configuração Autofs"
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr "Configuração de plugin autofs FusionDirectory"
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr "RDN AutoFS"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr "Filial em que informações de montagem automática serão armazenados"
+
 #: 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"
@@ -49,14 +69,6 @@ msgstr "Ponto de montagem"
 msgid "The mount point this directory will be placed in"
 msgstr "O ponto de montagem deste diretório será em"
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr "Ponto de montagem Autofs"
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr "Nome do ponto de montagem"
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr "Fs automático"
@@ -65,22 +77,10 @@ msgstr "Fs automático"
 msgid "Auto fs management"
 msgstr "Gerenciados automatico de fs"
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr "Configuração Autofs"
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr "Configuração de plugin autofs FusionDirectory"
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
-msgstr "RDN AutoFS"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
+msgstr "Ponto de montagem Autofs"
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
-msgstr "Filial em que informações de montagem automática serão armazenados"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
+msgstr "Nome do ponto de montagem"
diff --git a/autofs/locale/ru/fusiondirectory.po b/autofs/locale/ru/fusiondirectory.po
index 637e2b401a..6aa02d5278 100644
--- a/autofs/locale/ru/fusiondirectory.po
+++ b/autofs/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr "Настройки autofs"
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr "FusionDirectory настройка плагина autofs"
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr "AutoFS"
+
+#: 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 "Ветка, в которой информация об automount будет храниться"
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -50,14 +70,6 @@ msgstr "Точка монтирования"
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr "Название точки монтирования"
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr "Auto fs"
@@ -66,22 +78,10 @@ msgstr "Auto fs"
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr "Настройки autofs"
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr "FusionDirectory настройка плагина autofs"
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr "AutoFS"
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
-msgstr "Ветка, в которой информация об automount будет храниться"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
+msgstr "Название точки монтирования"
diff --git a/autofs/locale/ru@petr1708/fusiondirectory.po b/autofs/locale/ru@petr1708/fusiondirectory.po
index 70165ace1b..b891f8cc17 100644
--- a/autofs/locale/ru@petr1708/fusiondirectory.po
+++ b/autofs/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/sv/fusiondirectory.po b/autofs/locale/sv/fusiondirectory.po
index edf1c84065..88d33e685f 100644
--- a/autofs/locale/sv/fusiondirectory.po
+++ b/autofs/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr "Autofs-konfiguration"
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr "FusionDirectory autofs-plugin-konfiguration"
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr "AutoFS RDN"
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr "Gren där automount-information ska lagras"
+
 #: 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"
@@ -49,14 +69,6 @@ msgstr "Monteringspunkt"
 msgid "The mount point this directory will be placed in"
 msgstr "Monteringspunkt där katalogen kommer att placeras"
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr "Autofs monteringspunkt"
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr "Namn på monteringspunkten"
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr "Auto fs"
@@ -65,22 +77,10 @@ msgstr "Auto fs"
 msgid "Auto fs management"
 msgstr "Auto fs-hantering"
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr "Autofs-konfiguration"
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr "FusionDirectory autofs-plugin-konfiguration"
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
-msgstr "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
+msgstr "Autofs monteringspunkt"
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
-msgstr "Gren där automount-information ska lagras"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
+msgstr "Namn på monteringspunkten"
diff --git a/autofs/locale/ug/fusiondirectory.po b/autofs/locale/ug/fusiondirectory.po
index 4fb16fa6dc..43de0239f3 100644
--- a/autofs/locale/ug/fusiondirectory.po
+++ b/autofs/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:33+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/vi_VN/fusiondirectory.po b/autofs/locale/vi_VN/fusiondirectory.po
index 8cea5efd1e..b225ba3918 100644
--- a/autofs/locale/vi_VN/fusiondirectory.po
+++ b/autofs/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr ""
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/autofs/locale/zh/fusiondirectory.po b/autofs/locale/zh/fusiondirectory.po
index 84c2536b29..6d187db4cf 100644
--- a/autofs/locale/zh/fusiondirectory.po
+++ b/autofs/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
+
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
 msgid "Directory"
@@ -49,14 +69,6 @@ msgstr "挂载点"
 msgid "The mount point this directory will be placed in"
 msgstr ""
 
-#: admin/autofs/class_nisMap.inc:32
-msgid "Autofs mount point"
-msgstr ""
-
-#: admin/autofs/class_nisMap.inc:53
-msgid "Name of the mount point"
-msgstr ""
-
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
 msgstr ""
@@ -65,22 +77,10 @@ msgstr ""
 msgid "Auto fs management"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:28
-msgid "Autofs configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:29
-msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:42
-msgid "AutoFS"
-msgstr ""
-
-#: config/autofs/class_autofsConfig.inc:45
-msgid "AutoFS RDN"
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
 msgstr ""
 
-#: config/autofs/class_autofsConfig.inc:45
-msgid "Branch in which automount info will be stored"
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
 msgstr ""
diff --git a/certificates/locale/ar/fusiondirectory.po b/certificates/locale/ar/fusiondirectory.po
index 66b6f374c5..a99e8effd6 100644
--- a/certificates/locale/ar/fusiondirectory.po
+++ b/certificates/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/certificates/locale/ca/fusiondirectory.po b/certificates/locale/ca/fusiondirectory.po
index c3fed8956a..f6f58b8366 100644
--- a/certificates/locale/ca/fusiondirectory.po
+++ b/certificates/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/certificates/locale/cs_CZ/fusiondirectory.po b/certificates/locale/cs_CZ/fusiondirectory.po
index 5d89dfa3a4..426a152273 100644
--- a/certificates/locale/cs_CZ/fusiondirectory.po
+++ b/certificates/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/certificates/locale/de/fusiondirectory.po b/certificates/locale/de/fusiondirectory.po
index f2c3b1042f..1bfb6b2455 100644
--- a/certificates/locale/de/fusiondirectory.po
+++ b/certificates/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/certificates/locale/el_GR/fusiondirectory.po b/certificates/locale/el_GR/fusiondirectory.po
index 508ca73e48..5b3af9b8d4 100644
--- a/certificates/locale/el_GR/fusiondirectory.po
+++ b/certificates/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/certificates/locale/es/fusiondirectory.po b/certificates/locale/es/fusiondirectory.po
index 24e03ac158..a011060626 100644
--- a/certificates/locale/es/fusiondirectory.po
+++ b/certificates/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/certificates/locale/es_CO/fusiondirectory.po b/certificates/locale/es_CO/fusiondirectory.po
index 13dad06879..40a661569e 100644
--- a/certificates/locale/es_CO/fusiondirectory.po
+++ b/certificates/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/certificates/locale/es_VE/fusiondirectory.po b/certificates/locale/es_VE/fusiondirectory.po
index 20b30699bd..b853570b12 100644
--- a/certificates/locale/es_VE/fusiondirectory.po
+++ b/certificates/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/certificates/locale/fa_IR/fusiondirectory.po b/certificates/locale/fa_IR/fusiondirectory.po
index d49463fd9b..52b0e3add5 100644
--- a/certificates/locale/fa_IR/fusiondirectory.po
+++ b/certificates/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/certificates/locale/fi_FI/fusiondirectory.po b/certificates/locale/fi_FI/fusiondirectory.po
index 67c2e7050a..fa79e3bfca 100644
--- a/certificates/locale/fi_FI/fusiondirectory.po
+++ b/certificates/locale/fi_FI/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-01 11:36+0000\n"
 "Last-Translator: Dina Solveig Jalkanen\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/certificates/locale/fr/fusiondirectory.po b/certificates/locale/fr/fusiondirectory.po
index bd9cc31a3a..a7876b0bfa 100644
--- a/certificates/locale/fr/fusiondirectory.po
+++ b/certificates/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/certificates/locale/hu_HU/fusiondirectory.po b/certificates/locale/hu_HU/fusiondirectory.po
index 3056894933..ff7a7147c6 100644
--- a/certificates/locale/hu_HU/fusiondirectory.po
+++ b/certificates/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/certificates/locale/id/fusiondirectory.po b/certificates/locale/id/fusiondirectory.po
index d4344900b1..0fbf05db84 100644
--- a/certificates/locale/id/fusiondirectory.po
+++ b/certificates/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/certificates/locale/it_IT/fusiondirectory.po b/certificates/locale/it_IT/fusiondirectory.po
index 4de22824bf..25ab7e8fe0 100644
--- a/certificates/locale/it_IT/fusiondirectory.po
+++ b/certificates/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 14:38+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/certificates/locale/lv/fusiondirectory.po b/certificates/locale/lv/fusiondirectory.po
index 3e083d4a05..2b1794ec71 100644
--- a/certificates/locale/lv/fusiondirectory.po
+++ b/certificates/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/certificates/locale/nb/fusiondirectory.po b/certificates/locale/nb/fusiondirectory.po
index 7f75325816..3bb6d9b9ac 100644
--- a/certificates/locale/nb/fusiondirectory.po
+++ b/certificates/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/certificates/locale/nl/fusiondirectory.po b/certificates/locale/nl/fusiondirectory.po
index 9066f9d426..4bfcee8f69 100644
--- a/certificates/locale/nl/fusiondirectory.po
+++ b/certificates/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/certificates/locale/pl/fusiondirectory.po b/certificates/locale/pl/fusiondirectory.po
index fd4e8bff43..4b7408c263 100644
--- a/certificates/locale/pl/fusiondirectory.po
+++ b/certificates/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/certificates/locale/pt/fusiondirectory.po b/certificates/locale/pt/fusiondirectory.po
index c9e61642af..d0bb882813 100644
--- a/certificates/locale/pt/fusiondirectory.po
+++ b/certificates/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/certificates/locale/pt_BR/fusiondirectory.po b/certificates/locale/pt_BR/fusiondirectory.po
index 5e02a2c0d2..adc053ace8 100644
--- a/certificates/locale/pt_BR/fusiondirectory.po
+++ b/certificates/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/certificates/locale/ru/fusiondirectory.po b/certificates/locale/ru/fusiondirectory.po
index de93e9cfe2..bb504da6bb 100644
--- a/certificates/locale/ru/fusiondirectory.po
+++ b/certificates/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-08 21:27+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/certificates/locale/ru@petr1708/fusiondirectory.po b/certificates/locale/ru@petr1708/fusiondirectory.po
index c371555741..544662d9fe 100644
--- a/certificates/locale/ru@petr1708/fusiondirectory.po
+++ b/certificates/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/certificates/locale/sv/fusiondirectory.po b/certificates/locale/sv/fusiondirectory.po
index a1bb118b58..624ba9326d 100644
--- a/certificates/locale/sv/fusiondirectory.po
+++ b/certificates/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/certificates/locale/ug/fusiondirectory.po b/certificates/locale/ug/fusiondirectory.po
index 83d98d0b7c..5db25cfec5 100644
--- a/certificates/locale/ug/fusiondirectory.po
+++ b/certificates/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/certificates/locale/vi_VN/fusiondirectory.po b/certificates/locale/vi_VN/fusiondirectory.po
index 79d4c61120..b43702f01b 100644
--- a/certificates/locale/vi_VN/fusiondirectory.po
+++ b/certificates/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/certificates/locale/zh/fusiondirectory.po b/certificates/locale/zh/fusiondirectory.po
index 489c664395..47344f58ab 100644
--- a/certificates/locale/zh/fusiondirectory.po
+++ b/certificates/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/community/locale/ar/fusiondirectory.po b/community/locale/ar/fusiondirectory.po
index 8c75382538..17875b0bef 100644
--- a/community/locale/ar/fusiondirectory.po
+++ b/community/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr ""
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "البلد"
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/ca/fusiondirectory.po b/community/locale/ca/fusiondirectory.po
index c4f9d6db53..758e22d35b 100644
--- a/community/locale/ca/fusiondirectory.po
+++ b/community/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Província"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Estat"
-
-#: 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/cs_CZ/fusiondirectory.po b/community/locale/cs_CZ/fusiondirectory.po
index cd4a9fc93c..9b68ba6501 100644
--- a/community/locale/cs_CZ/fusiondirectory.po
+++ b/community/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Stát"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "ZemÄ›"
-
-#: 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/de/fusiondirectory.po b/community/locale/de/fusiondirectory.po
index 7316a9fc5d..aed5086d4a 100644
--- a/community/locale/de/fusiondirectory.po
+++ b/community/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Land"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Land"
-
-#: 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/el_GR/fusiondirectory.po b/community/locale/el_GR/fusiondirectory.po
index 84aa50555c..dc0787913a 100644
--- a/community/locale/el_GR/fusiondirectory.po
+++ b/community/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Πολιτεία"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Χώρα"
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/es/fusiondirectory.po b/community/locale/es/fusiondirectory.po
index fe29685820..0e44a7c5e1 100644
--- a/community/locale/es/fusiondirectory.po
+++ b/community/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Provincia"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "País"
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/es_CO/fusiondirectory.po b/community/locale/es_CO/fusiondirectory.po
index 89e6512cf5..9c0dc5f48e 100644
--- a/community/locale/es_CO/fusiondirectory.po
+++ b/community/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Estado"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "País"
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/es_VE/fusiondirectory.po b/community/locale/es_VE/fusiondirectory.po
index 62888850e4..dad1da8833 100644
--- a/community/locale/es_VE/fusiondirectory.po
+++ b/community/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Provincia"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "País"
-
-#: 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/fa_IR/fusiondirectory.po b/community/locale/fa_IR/fusiondirectory.po
index f38dec475f..e54791c9dc 100644
--- a/community/locale/fa_IR/fusiondirectory.po
+++ b/community/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr ""
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "کشور"
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/fi_FI/fusiondirectory.po b/community/locale/fi_FI/fusiondirectory.po
index 8b0471d4e4..4fff7b612c 100644
--- a/community/locale/fi_FI/fusiondirectory.po
+++ b/community/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-14 18:38+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr "Yhteisön asetukset"
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr "Yhteisö"
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr "Yhteisön projekti"
@@ -132,23 +152,3 @@ msgstr "Valtio"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Maa"
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr "Yhteisön asetukset"
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr "Yhteisö"
-
-#: 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/fr/fusiondirectory.po b/community/locale/fr/fusiondirectory.po
index 8291822a66..d6fd406d2d 100644
--- a/community/locale/fr/fusiondirectory.po
+++ b/community/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:16+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr "Configuration de Communauté"
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr "Configuration du plugin communautaire FusionDirectory"
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr "Projet communautaire"
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr "Choix du type d'adhésion"
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr "Types d'adhésion disponibles dans l'onglet communauté de cet d'utilisateur"
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr "Projet communautaire"
@@ -133,23 +153,3 @@ msgstr "Département"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Pays"
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr "Configuration de Communauté"
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr "Configuration du plugin communautaire FusionDirectory"
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr "Projet communautaire"
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr "Choix du type d'adhésion"
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr "Types d'adhésion disponibles dans l'onglet communauté de cet d'utilisateur"
diff --git a/community/locale/hu_HU/fusiondirectory.po b/community/locale/hu_HU/fusiondirectory.po
index 6b83c4ce43..4b7e03e77b 100644
--- a/community/locale/hu_HU/fusiondirectory.po
+++ b/community/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr ""
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr ""
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/id/fusiondirectory.po b/community/locale/id/fusiondirectory.po
index 247ee4df25..bf2177af21 100644
--- a/community/locale/id/fusiondirectory.po
+++ b/community/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr ""
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr ""
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/it_IT/fusiondirectory.po b/community/locale/it_IT/fusiondirectory.po
index 019ec9d897..78699be3c4 100644
--- a/community/locale/it_IT/fusiondirectory.po
+++ b/community/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:20+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,6 +19,26 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr "Configurazione community"
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr "Configurazione del plugin community di FusionDirectory"
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr "Comunità"
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr "Scelte tipo di abbonamento"
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr "Tipi di abbonamento community disponibili nella tabella community dell'utente"
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr "Progetto comunitario"
@@ -134,23 +154,3 @@ msgstr "Regione"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Stato"
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr "Configurazione community"
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr "Configurazione del plugin community di FusionDirectory"
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr "Comunità"
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr "Scelte tipo di abbonamento"
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr "Tipi di abbonamento community disponibili nella tabella community dell'utente"
diff --git a/community/locale/lv/fusiondirectory.po b/community/locale/lv/fusiondirectory.po
index da6a3d28cd..dad272fe3e 100644
--- a/community/locale/lv/fusiondirectory.po
+++ b/community/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Valsts"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Valsts"
-
-#: 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/nb/fusiondirectory.po b/community/locale/nb/fusiondirectory.po
index 934f382d65..f8a6d4d5ac 100644
--- a/community/locale/nb/fusiondirectory.po
+++ b/community/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr ""
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr ""
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/nl/fusiondirectory.po b/community/locale/nl/fusiondirectory.po
index e650e093a5..e2a16bd571 100644
--- a/community/locale/nl/fusiondirectory.po
+++ b/community/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Provincie"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Land"
-
-#: 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/pl/fusiondirectory.po b/community/locale/pl/fusiondirectory.po
index 7e5e439471..b26a86b1af 100644
--- a/community/locale/pl/fusiondirectory.po
+++ b/community/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Stan"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Kraj"
-
-#: 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/pt/fusiondirectory.po b/community/locale/pt/fusiondirectory.po
index 07bdb77af2..9d9c0ac3fa 100644
--- a/community/locale/pt/fusiondirectory.po
+++ b/community/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Estado"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "País"
-
-#: 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/pt_BR/fusiondirectory.po b/community/locale/pt_BR/fusiondirectory.po
index f7d43fd07b..f12485ba7f 100644
--- a/community/locale/pt_BR/fusiondirectory.po
+++ b/community/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Estado"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "País"
-
-#: 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/ru/fusiondirectory.po b/community/locale/ru/fusiondirectory.po
index 03c1e22570..6b56033987 100644
--- a/community/locale/ru/fusiondirectory.po
+++ b/community/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -19,6 +19,26 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -134,23 +154,3 @@ msgstr "Адм. единица"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Страна"
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/ru@petr1708/fusiondirectory.po b/community/locale/ru@petr1708/fusiondirectory.po
index 9397b61191..d3b36d03f2 100644
--- a/community/locale/ru@petr1708/fusiondirectory.po
+++ b/community/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr ""
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr ""
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/sv/fusiondirectory.po b/community/locale/sv/fusiondirectory.po
index 793be1d3ec..e954f84ac6 100644
--- a/community/locale/sv/fusiondirectory.po
+++ b/community/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Län"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Land"
-
-#: 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/ug/fusiondirectory.po b/community/locale/ug/fusiondirectory.po
index d11d1ee6a0..4cf0c97633 100644
--- a/community/locale/ug/fusiondirectory.po
+++ b/community/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr ""
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr ""
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/community/locale/vi_VN/fusiondirectory.po b/community/locale/vi_VN/fusiondirectory.po
index e52dee06f9..ee2c89e162 100644
--- a/community/locale/vi_VN/fusiondirectory.po
+++ b/community/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "Bang"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "Quốc Gia"
-
-#: 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/zh/fusiondirectory.po b/community/locale/zh/fusiondirectory.po
index 7a9ed03300..0edb50d439 100644
--- a/community/locale/zh/fusiondirectory.po
+++ b/community/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
+
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
 msgstr ""
@@ -132,23 +152,3 @@ msgstr "州/省"
 #: admin/departments/community/class_communityOrganization.inc:98
 msgid "Country"
 msgstr "国家"
-
-#: config/community/class_communityConfig.inc:28
-msgid "Community configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:29
-msgid "FusionDirectory community plugin configuration"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:41
-msgid "Community"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Membership type choices"
-msgstr ""
-
-#: config/community/class_communityConfig.inc:45
-msgid "Community membership types available in the user community tab"
-msgstr ""
diff --git a/cyrus/locale/ar/fusiondirectory.po b/cyrus/locale/ar/fusiondirectory.po
index a9cf5e89e0..2b32737b95 100644
--- a/cyrus/locale/ar/fusiondirectory.po
+++ b/cyrus/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/ca/fusiondirectory.po b/cyrus/locale/ca/fusiondirectory.po
index 3fa69a8ce3..d623ced80c 100644
--- a/cyrus/locale/ca/fusiondirectory.po
+++ b/cyrus/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/cs_CZ/fusiondirectory.po b/cyrus/locale/cs_CZ/fusiondirectory.po
index e9fa046158..bcaa49531f 100644
--- a/cyrus/locale/cs_CZ/fusiondirectory.po
+++ b/cyrus/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Nejsou určeny žádné poštovní servery slučitelné s protokolem IMAP! "
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr "Poštovní server pro tento účet je neplatný!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr "Chyba IMAP"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr "Nezdařilo se upravit kvótu pro schránku IMAP: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr "informace o zprávě"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr "Položka v LDAPu byla odebrána, ale schránka (%s) na Cyru zůstala.\nSmažte ji prosím ručně!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr "Modul imap_getacl není implementován!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr "Nedaří se získat skript Sieve: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr "Nedaří se uložit skript Sieve: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr "Nedaří se aktivovat skript Sieve: %s"
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr "Číslo portu, na kterém by měl být Cyrus sieve server kontaktován"
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr "Předvolby pro kontaktování serveru Cyrus sieve"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Nejsou určeny žádné poštovní servery slučitelné s protokolem IMAP! "
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr "Poštovní server pro tento účet je neplatný!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr "Chyba IMAP"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "Nezdařilo se upravit kvótu pro schránku IMAP: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr "informace o zprávě"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr "Položka v LDAPu byla odebrána, ale schránka (%s) na Cyru zůstala.\nSmažte ji prosím ručně!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr "Modul imap_getacl není implementován!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Nedaří se získat skript Sieve: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr "Nedaří se uložit skript Sieve: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr "Nedaří se aktivovat skript Sieve: %s"
diff --git a/cyrus/locale/de/fusiondirectory.po b/cyrus/locale/de/fusiondirectory.po
index 09d5caae9e..d565b4721a 100644
--- a/cyrus/locale/de/fusiondirectory.po
+++ b/cyrus/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,54 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Es sind keine IMAP-kompatible Mail-Server definiert!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr "Der Mail-Server für dieses Konto ist ungültig!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr "IMAP-Fehler"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr "Kann das IMAP-Postfach nicht verändern: '%s'"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr "Mail-Information"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr "Der LDAP-Eintrag wurde entfernt, aber die Cyrus-Mailbox (%s) wurde nicht gelöscht. Bitte löschen Sie diesen Eintrag manuell!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr "Die Funktion imap_getacl ist nicht implementiert!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr "Kann Sieve-Skript nicht beziehen: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr "Kann Sieve-Skript nicht speichern: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr "Kann das Sieve-Skript nicht aktivieren: %s"
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -105,51 +153,3 @@ msgstr "Portnummer unter der Cyrus sieve Server kontaktiert werden soll"
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr "Optionen für den Kontakt des Cyrus sieve Servers"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Es sind keine IMAP-kompatible Mail-Server definiert!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr "Der Mail-Server für dieses Konto ist ungültig!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr "IMAP-Fehler"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "Kann das IMAP-Postfach nicht verändern: '%s'"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr "Mail-Information"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr "Der LDAP-Eintrag wurde entfernt, aber die Cyrus-Mailbox (%s) wurde nicht gelöscht. Bitte löschen Sie diesen Eintrag manuell!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr "Die Funktion imap_getacl ist nicht implementiert!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Kann Sieve-Skript nicht beziehen: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr "Kann Sieve-Skript nicht speichern: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr "Kann das Sieve-Skript nicht aktivieren: %s"
diff --git a/cyrus/locale/el_GR/fusiondirectory.po b/cyrus/locale/el_GR/fusiondirectory.po
index 324149d509..8ab5c82da2 100644
--- a/cyrus/locale/el_GR/fusiondirectory.po
+++ b/cyrus/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,54 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Δεν έχουν ορισθεί συμβατοί διακομιστές αλληλογραφίας IMAP!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr "Ο διακομιστής αλληλογραφίας για αυτόν το λογαριασμό είναι άκυρος!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr "Σφάλμα IMAP"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr "Αδυναμία τροποποίησης quota γραμ/κιβωτίου IMAP: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr "Πληροφορίες αλληλογραφίας"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr "Η εγγραφή LDAP έχει απομακρυνθεί αλλά έχει διατηρηθεί το cyrus mailbox (%s) .\nΠαρακαλώ διαγράψτε χειρωνακτικά!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr "Το module imap_getacl  δεν έχει εφαρμοστεί!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr "Αδυναμία λήψης SIEVE script: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr "Αδυναμία αποθήκευσης SIEVE script: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr "Αδυναμία ενεργοποίησης SIEVE script: %s"
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -105,51 +153,3 @@ msgstr "Αριθμός θύρας για την επικοινωνία με το
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr "Επιλογές επικοινωνίας με τον διακομιστή Cyrus sieve"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Δεν έχουν ορισθεί συμβατοί διακομιστές αλληλογραφίας IMAP!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr "Ο διακομιστής αλληλογραφίας για αυτόν το λογαριασμό είναι άκυρος!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr "Σφάλμα IMAP"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "Αδυναμία τροποποίησης quota γραμ/κιβωτίου IMAP: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr "Πληροφορίες αλληλογραφίας"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr "Η εγγραφή LDAP έχει απομακρυνθεί αλλά έχει διατηρηθεί το cyrus mailbox (%s) .\nΠαρακαλώ διαγράψτε χειρωνακτικά!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr "Το module imap_getacl  δεν έχει εφαρμοστεί!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Αδυναμία λήψης SIEVE script: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr "Αδυναμία αποθήκευσης SIEVE script: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr "Αδυναμία ενεργοποίησης SIEVE script: %s"
diff --git a/cyrus/locale/es/fusiondirectory.po b/cyrus/locale/es/fusiondirectory.po
index ea2ba03247..a2a3b6e30d 100644
--- a/cyrus/locale/es/fusiondirectory.po
+++ b/cyrus/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "¡No se han definido servidores IMAP compatibles!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr "¡El servidor de correo para esta cuenta no es válido!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr "Error IMAP"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr "No se puede modificar la cuota del buzón de correo IMAP: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr "Información del correo"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr "La entrada en LDAP ha sido eliminada, pero el buzón de correo cyrus (%s) existe.\n¡Por favor elimine el buzón manualmente!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr "¡No se ha implementado el módulo imap_getacl!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr "No se puede acceder al script SIEVE: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr "No se puede guardar el script SIEVE: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr "No se puede activar el script SIEVE: %s"
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "¡No se han definido servidores IMAP compatibles!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr "¡El servidor de correo para esta cuenta no es válido!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr "Error IMAP"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "No se puede modificar la cuota del buzón de correo IMAP: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr "Información del correo"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr "La entrada en LDAP ha sido eliminada, pero el buzón de correo cyrus (%s) existe.\n¡Por favor elimine el buzón manualmente!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr "¡No se ha implementado el módulo imap_getacl!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr "No se puede acceder al script SIEVE: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr "No se puede guardar el script SIEVE: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr "No se puede activar el script SIEVE: %s"
diff --git a/cyrus/locale/es_CO/fusiondirectory.po b/cyrus/locale/es_CO/fusiondirectory.po
index b18237a125..64cb9dd283 100644
--- a/cyrus/locale/es_CO/fusiondirectory.po
+++ b/cyrus/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/es_VE/fusiondirectory.po b/cyrus/locale/es_VE/fusiondirectory.po
index b58b6f5aad..95708ddb33 100644
--- a/cyrus/locale/es_VE/fusiondirectory.po
+++ b/cyrus/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "¡No se han definido servidores IMAP compatibles!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr "¡El servidor de correo para esta cuenta no es válido!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr "Error IMAP"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr "No se puede modificar la cuota del buzón de correo IMAP: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr "Información del correo"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr "La entrada en LDAP ha sido eliminada, pero el buzón de correo cyrus (%s) existe.\n¡Por favor elimine el buzón manualmente!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr "¡No se ha implementado el módulo imap_getacl!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr "No se puede acceder al script SIEVE: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr "No se puede guardar el script SIEVE: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr "No se puede activar el script SIEVE: %s"
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "¡No se han definido servidores IMAP compatibles!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr "¡El servidor de correo para esta cuenta no es válido!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr "Error IMAP"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "No se puede modificar la cuota del buzón de correo IMAP: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr "Información del correo"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr "La entrada en LDAP ha sido eliminada, pero el buzón de correo cyrus (%s) existe.\n¡Por favor elimine el buzón manualmente!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr "¡No se ha implementado el módulo imap_getacl!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr "No se puede acceder al script SIEVE: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr "No se puede guardar el script SIEVE: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr "No se puede activar el script SIEVE: %s"
diff --git a/cyrus/locale/fa_IR/fusiondirectory.po b/cyrus/locale/fa_IR/fusiondirectory.po
index 036180d039..771a0d65d8 100644
--- a/cyrus/locale/fa_IR/fusiondirectory.po
+++ b/cyrus/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/fi_FI/fusiondirectory.po b/cyrus/locale/fi_FI/fusiondirectory.po
index 865f741bc2..78488cfad5 100644
--- a/cyrus/locale/fi_FI/fusiondirectory.po
+++ b/cyrus/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr "IMAP virhe"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr "Ei pysty noutamaan SIEVE skriptia: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr "IMAP virhe"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Ei pysty noutamaan SIEVE skriptia: %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/fr/fusiondirectory.po b/cyrus/locale/fr/fusiondirectory.po
index cf71db301f..c3037a5514 100644
--- a/cyrus/locale/fr/fusiondirectory.po
+++ b/cyrus/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,6 +18,54 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Il n'y a aucun serveur IMAP compatible défini !"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr "Le serveur de courriel pour ce compte est invalide !"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr "Erreur IMAP"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr "Impossible de modifier le quota de la boite IMAP : %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr "Informations de courriel"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr "L’entrée LDAP a été supprimée mais le compte de courriel (%s) est toujours présent dans Cyrus.\nVeuillez le supprimer manuellement !"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr "Le module imap_getacl n'est pas implémenté !"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr "Impossible de récupérer le script SIEVE : %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr "Impossible de stocker le script SIEVE : %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr "Impossible d'activer le script SIEVE : %s"
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -105,51 +153,3 @@ msgstr "Numéro de port sur ​​lequel le serveur Sieve de Cyrus doit être co
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr "Options pour contacter le serveur Sieve de Cyrus"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Il n'y a aucun serveur IMAP compatible défini !"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr "Le serveur de courriel pour ce compte est invalide !"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr "Erreur IMAP"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "Impossible de modifier le quota de la boite IMAP : %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr "Informations de courriel"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr "L’entrée LDAP a été supprimée mais le compte de courriel (%s) est toujours présent dans Cyrus.\nVeuillez le supprimer manuellement !"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr "Le module imap_getacl n'est pas implémenté !"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Impossible de récupérer le script SIEVE : %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr "Impossible de stocker le script SIEVE : %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr "Impossible d'activer le script SIEVE : %s"
diff --git a/cyrus/locale/hu_HU/fusiondirectory.po b/cyrus/locale/hu_HU/fusiondirectory.po
index 03f6cc4fee..4583e630e6 100644
--- a/cyrus/locale/hu_HU/fusiondirectory.po
+++ b/cyrus/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/id/fusiondirectory.po b/cyrus/locale/id/fusiondirectory.po
index 91c844dd9e..fdf752e4f3 100644
--- a/cyrus/locale/id/fusiondirectory.po
+++ b/cyrus/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/it_IT/fusiondirectory.po b/cyrus/locale/it_IT/fusiondirectory.po
index 7673a58d95..50402c3bdb 100644
--- a/cyrus/locale/it_IT/fusiondirectory.po
+++ b/cyrus/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:20+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,6 +19,54 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Non è stato definito nessun server IMAP compatibile !"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr "Il server di posta elettronica di questo account non è valido !"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr "Errore IMAP"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr "Impossibile modificare la quota della casella di posta elettronica IMAP :%s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr "informazioni Mail"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr "L'entry LDAP è stata eliminata, ma la casella di posta elettronica (%s) è ancora presente in cyrus.\nElimina manualmente !"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr "Il modulo imap_getacl non è implementato !"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr "Impossibile recuperare lo script SIEVE : %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr "Impossibile memorizzare lo script SIEVE : %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr "Impossibile attivare lo script SIEVE : %s"
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -106,51 +154,3 @@ msgstr "Numero della porta sulla quale sieve Cyrus server sarà contattato"
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr "Opzioni per contattare il server Sieve di Cyrus"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Non è stato definito nessun server IMAP compatibile !"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr "Il server di posta elettronica di questo account non è valido !"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr "Errore IMAP"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "Impossibile modificare la quota della casella di posta elettronica IMAP :%s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr "informazioni Mail"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr "L'entry LDAP è stata eliminata, ma la casella di posta elettronica (%s) è ancora presente in cyrus.\nElimina manualmente !"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr "Il modulo imap_getacl non è implementato !"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Impossibile recuperare lo script SIEVE : %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr "Impossibile memorizzare lo script SIEVE : %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr "Impossibile attivare lo script SIEVE : %s"
diff --git a/cyrus/locale/lv/fusiondirectory.po b/cyrus/locale/lv/fusiondirectory.po
index aa006b0b7e..f8de3be2e1 100644
--- a/cyrus/locale/lv/fusiondirectory.po
+++ b/cyrus/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/nb/fusiondirectory.po b/cyrus/locale/nb/fusiondirectory.po
index 7471ece653..a5e0dd4bfe 100644
--- a/cyrus/locale/nb/fusiondirectory.po
+++ b/cyrus/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/nl/fusiondirectory.po b/cyrus/locale/nl/fusiondirectory.po
index ed5a0c21af..4a215c858b 100644
--- a/cyrus/locale/nl/fusiondirectory.po
+++ b/cyrus/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Er zijn geen IMAP compatibele mail servers gedefinieerd!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr "Mail server voor deze account is niet geldig!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr "IMAP fout"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr "Kan IMAP mailbox quota niet wijzigen : %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr "Mail info"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr "LDAP invoer is verwijderd, maar cyrus mailbox (%s) wordt gehouden.⏎ Gelieve deze handmatig te verwijderen!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr "De module imap_getacl is niet geïmplementeerd!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr "Kan SIEVE script niet vinden : %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr "Kan SIEVE script niet opslaan : %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr "Kan SIEVE script niet activeren : %s"
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Er zijn geen IMAP compatibele mail servers gedefinieerd!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr "Mail server voor deze account is niet geldig!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr "IMAP fout"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "Kan IMAP mailbox quota niet wijzigen : %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr "Mail info"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr "LDAP invoer is verwijderd, maar cyrus mailbox (%s) wordt gehouden.⏎ Gelieve deze handmatig te verwijderen!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr "De module imap_getacl is niet geïmplementeerd!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Kan SIEVE script niet vinden : %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr "Kan SIEVE script niet opslaan : %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr "Kan SIEVE script niet activeren : %s"
diff --git a/cyrus/locale/pl/fusiondirectory.po b/cyrus/locale/pl/fusiondirectory.po
index 02f1c11e64..8a111f9aa4 100644
--- a/cyrus/locale/pl/fusiondirectory.po
+++ b/cyrus/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/pt/fusiondirectory.po b/cyrus/locale/pt/fusiondirectory.po
index c80749a1f9..e0b1460c60 100644
--- a/cyrus/locale/pt/fusiondirectory.po
+++ b/cyrus/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/pt_BR/fusiondirectory.po b/cyrus/locale/pt_BR/fusiondirectory.po
index f1891df691..fa132b2d73 100644
--- a/cyrus/locale/pt_BR/fusiondirectory.po
+++ b/cyrus/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Não existem servidores de correio IMAP compatíveis!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr "Servidor de correio para esta conta é inválido!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr "Erro de IMAP"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr "Impossível modificar caixa de e-mail IMAP :%s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr "Informação de correio"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr "Entrada LDAP foi removida mas a caixa de correio cyrus (%s) foi mantida. Por favor, delete manualmente!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr "O modulo imap_getacl não está implementado!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr "Não é possível recuperar script SIEVE : %s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr "Não é possível armazenar script SIEVE:%s"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr "Não é possível ativar script SIEVE:%s"
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr "Número da porta onde o filtro do servidor Cyrus deve ser contactado"
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr "Opções para contactar filtro do servidor Cyrus"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Não existem servidores de correio IMAP compatíveis!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr "Servidor de correio para esta conta é inválido!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr "Erro de IMAP"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "Impossível modificar caixa de e-mail IMAP :%s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr "Informação de correio"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr "Entrada LDAP foi removida mas a caixa de correio cyrus (%s) foi mantida. Por favor, delete manualmente!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr "O modulo imap_getacl não está implementado!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Não é possível recuperar script SIEVE : %s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr "Não é possível armazenar script SIEVE:%s"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr "Não é possível ativar script SIEVE:%s"
diff --git a/cyrus/locale/ru/fusiondirectory.po b/cyrus/locale/ru/fusiondirectory.po
index d85191efd5..4db51d7ff1 100644
--- a/cyrus/locale/ru/fusiondirectory.po
+++ b/cyrus/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-24 12:43+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Не определен IMAP совместимый почтовый сервер!"
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Не определен IMAP совместимый почтовый сервер!"
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/ru@petr1708/fusiondirectory.po b/cyrus/locale/ru@petr1708/fusiondirectory.po
index 7711cf8461..05da4c4ed5 100644
--- a/cyrus/locale/ru@petr1708/fusiondirectory.po
+++ b/cyrus/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/sv/fusiondirectory.po b/cyrus/locale/sv/fusiondirectory.po
index bfa32771f0..8872ef8ee3 100644
--- a/cyrus/locale/sv/fusiondirectory.po
+++ b/cyrus/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/ug/fusiondirectory.po b/cyrus/locale/ug/fusiondirectory.po
index f4cb6775da..8600ec5aac 100644
--- a/cyrus/locale/ug/fusiondirectory.po
+++ b/cyrus/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:34+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/vi_VN/fusiondirectory.po b/cyrus/locale/vi_VN/fusiondirectory.po
index a34e44c702..b6daac1a01 100644
--- a/cyrus/locale/vi_VN/fusiondirectory.po
+++ b/cyrus/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/cyrus/locale/zh/fusiondirectory.po b/cyrus/locale/zh/fusiondirectory.po
index f04a58bd63..63888c7bf1 100644
--- a/cyrus/locale/zh/fusiondirectory.po
+++ b/cyrus/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,54 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
+
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
@@ -104,51 +152,3 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
-msgid "Mail info"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid ""
-"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
-"Please delete it manually!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:455
-msgid "The module imap_getacl is not implemented!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:524
-#, php-format
-msgid "Cannot retrieve SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:593
-#, php-format
-msgid "Cannot store SIEVE script: %s"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:600
-#, php-format
-msgid "Cannot activate SIEVE script: %s"
-msgstr ""
diff --git a/debconf/locale/ar/fusiondirectory.po b/debconf/locale/ar/fusiondirectory.po
index 11b6dc6e0a..7229b233e6 100644
--- a/debconf/locale/ar/fusiondirectory.po
+++ b/debconf/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: admin/debconfProfile/class_debconfProfileManagement.inc:32
-#: admin/systems/debconf/class_debconfStartup.inc:33
-msgid "Debconf"
-msgstr ""
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr ""
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/ca/fusiondirectory.po b/debconf/locale/ca/fusiondirectory.po
index a5b2fd4bbd..eb605a906f 100644
--- a/debconf/locale/ca/fusiondirectory.po
+++ b/debconf/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: ca\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/cs_CZ/fusiondirectory.po b/debconf/locale/cs_CZ/fusiondirectory.po
index d34363f539..fd5402a5e3 100644
--- a/debconf/locale/cs_CZ/fusiondirectory.po
+++ b/debconf/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/debconfProfile/class_debconfProfileManagement.inc:32
-#: admin/systems/debconf/class_debconfStartup.inc:33
-msgid "Debconf"
-msgstr "Debconf"
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr "Správa Debconf sady nastavení"
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr "Odpovědi Debconf šablony"
 msgid "Import"
 msgstr "Import"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr "Debconf"
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr "Správa Debconf sady nastavení"
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr "Spuštění přednastavení Debconf"
diff --git a/debconf/locale/de/fusiondirectory.po b/debconf/locale/de/fusiondirectory.po
index 48bd264ac4..a71b43bc3a 100644
--- a/debconf/locale/de/fusiondirectory.po
+++ b/debconf/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,15 +18,6 @@ msgstr ""
 "Language: de\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 "Debconf"
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr "Debconf Profilverwaltung"
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -93,6 +84,15 @@ msgstr "Debconf Vorlage Antworten"
 msgid "Import"
 msgstr "Importieren"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr "Debconf"
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr "Debconf Profilverwaltung"
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr "Debconf preseed startup"
diff --git a/debconf/locale/el_GR/fusiondirectory.po b/debconf/locale/el_GR/fusiondirectory.po
index 1411518584..51d1ddf586 100644
--- a/debconf/locale/el_GR/fusiondirectory.po
+++ b/debconf/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: el_GR\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 "Debconf"
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr "Διαχείριση προφίλ Debconf "
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr "Απαντήσεις προτύπου Debconf"
 msgid "Import"
 msgstr "Εισαγωγή"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr "Debconf"
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr "Διαχείριση προφίλ Debconf "
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr "Debconf preseed startup"
diff --git a/debconf/locale/es/fusiondirectory.po b/debconf/locale/es/fusiondirectory.po
index 5368df5a20..07a75ffb1b 100644
--- a/debconf/locale/es/fusiondirectory.po
+++ b/debconf/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: es\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr "Importar"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/es_CO/fusiondirectory.po b/debconf/locale/es_CO/fusiondirectory.po
index 24a7605b92..0594368927 100644
--- a/debconf/locale/es_CO/fusiondirectory.po
+++ b/debconf/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: es_CO\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/es_VE/fusiondirectory.po b/debconf/locale/es_VE/fusiondirectory.po
index b2fa839134..e5f185b153 100644
--- a/debconf/locale/es_VE/fusiondirectory.po
+++ b/debconf/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: es_VE\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr "Importar"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/fa_IR/fusiondirectory.po b/debconf/locale/fa_IR/fusiondirectory.po
index 22879e068d..4fd33580e6 100644
--- a/debconf/locale/fa_IR/fusiondirectory.po
+++ b/debconf/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: fa_IR\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/fi_FI/fusiondirectory.po b/debconf/locale/fi_FI/fusiondirectory.po
index 521fe96e52..a824e4f113 100644
--- a/debconf/locale/fi_FI/fusiondirectory.po
+++ b/debconf/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:35+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: fi_FI\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/fr/fusiondirectory.po b/debconf/locale/fr/fusiondirectory.po
index 6ce7b354c6..1b60d108ea 100644
--- a/debconf/locale/fr/fusiondirectory.po
+++ b/debconf/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,15 +18,6 @@ msgstr ""
 "Language: fr\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 "Debconf"
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr "Gestion des profils Debconf"
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -93,6 +84,15 @@ msgstr "Réponses du modèle Debconf"
 msgid "Import"
 msgstr "Importer"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr "Debconf"
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr "Gestion des profils Debconf"
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr "Démarrage par preseed Debconf"
diff --git a/debconf/locale/hu_HU/fusiondirectory.po b/debconf/locale/hu_HU/fusiondirectory.po
index 4a4c9e9d0f..6c62daed55 100644
--- a/debconf/locale/hu_HU/fusiondirectory.po
+++ b/debconf/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:35+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: hu_HU\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/id/fusiondirectory.po b/debconf/locale/id/fusiondirectory.po
index b3b984b724..6ba5b24687 100644
--- a/debconf/locale/id/fusiondirectory.po
+++ b/debconf/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:35+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: id\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/it_IT/fusiondirectory.po b/debconf/locale/it_IT/fusiondirectory.po
index a31c7be946..8b94d6f7e5 100644
--- a/debconf/locale/it_IT/fusiondirectory.po
+++ b/debconf/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:21+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,15 +19,6 @@ msgstr ""
 "Language: it_IT\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 "Debconf"
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr "Gestione del profilo debconf"
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -94,6 +85,15 @@ msgstr "Risposte al modello Debconf"
 msgid "Import"
 msgstr "Importa"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr "Debconf"
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr "Gestione del profilo debconf"
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr "Avvio Debconf preconfigurato"
diff --git a/debconf/locale/lv/fusiondirectory.po b/debconf/locale/lv/fusiondirectory.po
index 67e5a9cf00..9d2a571614 100644
--- a/debconf/locale/lv/fusiondirectory.po
+++ b/debconf/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/debconfProfile/class_debconfProfileManagement.inc:32
-#: admin/systems/debconf/class_debconfStartup.inc:33
-msgid "Debconf"
-msgstr ""
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr ""
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/nb/fusiondirectory.po b/debconf/locale/nb/fusiondirectory.po
index 1b7455ad0b..48e4cd6045 100644
--- a/debconf/locale/nb/fusiondirectory.po
+++ b/debconf/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: nb\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/nl/fusiondirectory.po b/debconf/locale/nl/fusiondirectory.po
index 8bc7df7ad0..2d91c8708b 100644
--- a/debconf/locale/nl/fusiondirectory.po
+++ b/debconf/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: nl\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr "Importeren"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/pl/fusiondirectory.po b/debconf/locale/pl/fusiondirectory.po
index db125a54a6..636ad2d866 100644
--- a/debconf/locale/pl/fusiondirectory.po
+++ b/debconf/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/debconfProfile/class_debconfProfileManagement.inc:32
-#: admin/systems/debconf/class_debconfStartup.inc:33
-msgid "Debconf"
-msgstr ""
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr ""
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr "Import"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/pt/fusiondirectory.po b/debconf/locale/pt/fusiondirectory.po
index 799d83db2d..38cee0a0c9 100644
--- a/debconf/locale/pt/fusiondirectory.po
+++ b/debconf/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: pt\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/pt_BR/fusiondirectory.po b/debconf/locale/pt_BR/fusiondirectory.po
index 2c19b40aae..b5d42c8df9 100644
--- a/debconf/locale/pt_BR/fusiondirectory.po
+++ b/debconf/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: pt_BR\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 "Debconf"
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr "Gerenciador de perfil Debconf"
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr "Modelo de respostas Debconf"
 msgid "Import"
 msgstr "Importar"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr "Debconf"
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr "Gerenciador de perfil Debconf"
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr "Debconf precisa começar"
diff --git a/debconf/locale/ru/fusiondirectory.po b/debconf/locale/ru/fusiondirectory.po
index bf6ead62a2..1ab33558f7 100644
--- a/debconf/locale/ru/fusiondirectory.po
+++ b/debconf/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/debconfProfile/class_debconfProfileManagement.inc:32
-#: admin/systems/debconf/class_debconfStartup.inc:33
-msgid "Debconf"
-msgstr "Debconf"
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr ""
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr "Импортировать"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr "Debconf"
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/ru@petr1708/fusiondirectory.po b/debconf/locale/ru@petr1708/fusiondirectory.po
index 8d8d10476b..eb1ca2a26f 100644
--- a/debconf/locale/ru@petr1708/fusiondirectory.po
+++ b/debconf/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:35+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/debconfProfile/class_debconfProfileManagement.inc:32
-#: admin/systems/debconf/class_debconfStartup.inc:33
-msgid "Debconf"
-msgstr ""
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr ""
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/sv/fusiondirectory.po b/debconf/locale/sv/fusiondirectory.po
index 94cf7b489f..d95e0b2cfb 100644
--- a/debconf/locale/sv/fusiondirectory.po
+++ b/debconf/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: sv\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 "Debconf"
-
-#: admin/debconfProfile/class_debconfProfileManagement.inc:33
-msgid "Debconf profile management"
-msgstr ""
-
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr "Debconf"
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/ug/fusiondirectory.po b/debconf/locale/ug/fusiondirectory.po
index 5e0e8e1aa1..fbe09b334d 100644
--- a/debconf/locale/ug/fusiondirectory.po
+++ b/debconf/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:35+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: ug\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/vi_VN/fusiondirectory.po b/debconf/locale/vi_VN/fusiondirectory.po
index 5d80562dd5..b30bd3039a 100644
--- a/debconf/locale/vi_VN/fusiondirectory.po
+++ b/debconf/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: vi_VN\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/debconf/locale/zh/fusiondirectory.po b/debconf/locale/zh/fusiondirectory.po
index 5dc77fe480..86a9a5bc5b 100644
--- a/debconf/locale/zh/fusiondirectory.po
+++ b/debconf/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Language: zh\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:72
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 msgid "Error"
@@ -92,6 +83,15 @@ msgstr ""
 msgid "Import"
 msgstr "导入"
 
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
 msgstr ""
diff --git a/developers/locale/ar/fusiondirectory.po b/developers/locale/ar/fusiondirectory.po
index 6efbee4894..855edc4ff7 100644
--- a/developers/locale/ar/fusiondirectory.po
+++ b/developers/locale/ar/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:35+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,6 @@ 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"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/ca/fusiondirectory.po b/developers/locale/ca/fusiondirectory.po
index 1e2098db31..6b3cc41bd0 100644
--- a/developers/locale/ca/fusiondirectory.po
+++ b/developers/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/cs_CZ/fusiondirectory.po b/developers/locale/cs_CZ/fusiondirectory.po
index 680bcbe666..2645546d28 100644
--- a/developers/locale/cs_CZ/fusiondirectory.po
+++ b/developers/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-msgid "Debug help"
-msgstr "Pomocná diagnostika"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:27
-msgid "Debug help tools"
-msgstr "Pomocné diagnostické nástroje"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:31
-msgid "Diagram"
-msgstr "Diagram"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr "Diagramy"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr "Diagram typů objektů"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr "Získat"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr "Typy objektů"
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr "Údaje o vlasech"
@@ -133,6 +105,31 @@ msgstr "Ukázkový zásuvný modul"
 msgid "Edit some useless personal information"
 msgstr "Upravit nějaké neužitečné osobní údaje"
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr "Pomocná diagnostika"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr "Pomocné diagnostické nástroje"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr "Diagramy"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr "Diagram typů objektů"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr "Získat"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr "Typy objektů"
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr "Nedostačující oprávnění"
diff --git a/developers/locale/de/fusiondirectory.po b/developers/locale/de/fusiondirectory.po
index a8948dbd6c..e06efb4e1f 100644
--- a/developers/locale/de/fusiondirectory.po
+++ b/developers/locale/de/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -18,34 +18,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-msgid "Debug help"
-msgstr "Debug-Hilfe"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:27
-msgid "Debug help tools"
-msgstr "Debug-Hilfewerkzeuge"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:31
-msgid "Diagram"
-msgstr "Diagramm"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr "Diagramme"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr "Objektartendiagramm"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr "Erhalten"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr "Objekttypen"
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr "Haar Information"
@@ -134,6 +106,31 @@ msgstr "Demo Plugin"
 msgid "Edit some useless personal information"
 msgstr "Bearbeiten Sie einige nutzlose persönliche Informationen"
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr "Debug-Hilfe"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr "Debug-Hilfewerkzeuge"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr "Diagramme"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr "Objektartendiagramm"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr "Erhalten"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr "Objekttypen"
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr "Nicht ausreichende Rechte"
diff --git a/developers/locale/el_GR/fusiondirectory.po b/developers/locale/el_GR/fusiondirectory.po
index 4d9c4b0950..0ca7edd235 100644
--- a/developers/locale/el_GR/fusiondirectory.po
+++ b/developers/locale/el_GR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,34 +18,6 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr "Διάγραμμα"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr "Διαγράμματα"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr "Διάγραμμα Object types"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr "Get"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr "Object Types"
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr "Πληροφορίες μαλλιού"
@@ -134,6 +106,31 @@ msgstr "Πρόσθετο επίδειξης"
 msgid "Edit some useless personal information"
 msgstr "Επεξεργασία άχρηστων προσωπικών πληροφοριών"
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr "Βοήθεια αποσφαλμάτωσης"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr "Εργαλεία βοήθειας αποσφαλμάτωσης"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr "Διαγράμματα"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr "Διάγραμμα Object types"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr "Get"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr "Object Types"
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr "Ανεπαρκή προνόμια"
diff --git a/developers/locale/es/fusiondirectory.po b/developers/locale/es/fusiondirectory.po
index f55fd8e2e2..a576d5ff88 100644
--- a/developers/locale/es/fusiondirectory.po
+++ b/developers/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 17:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/es_CO/fusiondirectory.po b/developers/locale/es_CO/fusiondirectory.po
index 0e8752f4ed..630c798fd0 100644
--- a/developers/locale/es_CO/fusiondirectory.po
+++ b/developers/locale/es_CO/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,34 +18,6 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -134,6 +106,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/es_VE/fusiondirectory.po b/developers/locale/es_VE/fusiondirectory.po
index 3927521b1c..012ef48891 100644
--- a/developers/locale/es_VE/fusiondirectory.po
+++ b/developers/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/fa_IR/fusiondirectory.po b/developers/locale/fa_IR/fusiondirectory.po
index 6c1a41ea9b..3eb03da259 100644
--- a/developers/locale/fa_IR/fusiondirectory.po
+++ b/developers/locale/fa_IR/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:35+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/fi_FI/fusiondirectory.po b/developers/locale/fi_FI/fusiondirectory.po
index 873c1e57c2..f65562f8f6 100644
--- a/developers/locale/fi_FI/fusiondirectory.po
+++ b/developers/locale/fi_FI/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:35+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/fr/fusiondirectory.po b/developers/locale/fr/fusiondirectory.po
index 87dbbe6af6..0bf4d9d93e 100644
--- a/developers/locale/fr/fusiondirectory.po
+++ b/developers/locale/fr/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,34 +18,6 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-msgid "Debug help"
-msgstr "Aide au débogage "
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:27
-msgid "Debug help tools"
-msgstr "Des outils d'aide au débogage "
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:31
-msgid "Diagram"
-msgstr "Diagramme"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr "Diagrammes"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr "Diagramme des types d’objets"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr "Télécharger"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr "Types d'objets"
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr "Information sur les cheveux"
@@ -134,6 +106,31 @@ msgstr "Plugin de démonstration"
 msgid "Edit some useless personal information"
 msgstr "Éditer d’inutiles Informations personnelles"
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr "Aide au débogage "
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr "Des outils d'aide au débogage "
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr "Diagrammes"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr "Diagramme des types d’objets"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr "Télécharger"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr "Types d'objets"
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr "Permissions insuffisantes"
diff --git a/developers/locale/hu_HU/fusiondirectory.po b/developers/locale/hu_HU/fusiondirectory.po
index 3d13b46985..00a0040287 100644
--- a/developers/locale/hu_HU/fusiondirectory.po
+++ b/developers/locale/hu_HU/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:35+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/id/fusiondirectory.po b/developers/locale/id/fusiondirectory.po
index 57ff86cd08..d4f9b3419f 100644
--- a/developers/locale/id/fusiondirectory.po
+++ b/developers/locale/id/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:35+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/it_IT/fusiondirectory.po b/developers/locale/it_IT/fusiondirectory.po
index e46ed3ed50..89fc4d18df 100644
--- a/developers/locale/it_IT/fusiondirectory.po
+++ b/developers/locale/it_IT/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-02 15:21+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,34 +19,6 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-msgid "Debug help"
-msgstr "Aiuto debug"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:27
-msgid "Debug help tools"
-msgstr "Strumenti di assistenza di debug "
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:31
-msgid "Diagram"
-msgstr "Diagramma"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr "Diagrammi"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr "Diagramma di tipi di oggetti"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr "Ottenere"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr "Tipi di oggetti"
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr "Informazioni sui capelli"
@@ -135,6 +107,31 @@ msgstr "Plugin Demo"
 msgid "Edit some useless personal information"
 msgstr "Modificare alcune informazioni personali inutili"
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr "Aiuto debug"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr "Strumenti di assistenza di debug "
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr "Diagrammi"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr "Diagramma di tipi di oggetti"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr "Ottenere"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr "Tipi di oggetti"
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr "Autorizzazioni insufficienti"
diff --git a/developers/locale/lv/fusiondirectory.po b/developers/locale/lv/fusiondirectory.po
index 4abcf95570..579dfea284 100644
--- a/developers/locale/lv/fusiondirectory.po
+++ b/developers/locale/lv/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:35+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/nb/fusiondirectory.po b/developers/locale/nb/fusiondirectory.po
index d4dfd26318..bcf9d6a3c3 100644
--- a/developers/locale/nb/fusiondirectory.po
+++ b/developers/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:38+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/nl/fusiondirectory.po b/developers/locale/nl/fusiondirectory.po
index 2efab76f54..b44f05f795 100644
--- a/developers/locale/nl/fusiondirectory.po
+++ b/developers/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/pl/fusiondirectory.po b/developers/locale/pl/fusiondirectory.po
index 83bacf96f1..810f84d1ff 100644
--- a/developers/locale/pl/fusiondirectory.po
+++ b/developers/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/pt/fusiondirectory.po b/developers/locale/pt/fusiondirectory.po
index d6cd55316e..d6830c46fb 100644
--- a/developers/locale/pt/fusiondirectory.po
+++ b/developers/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/pt_BR/fusiondirectory.po b/developers/locale/pt_BR/fusiondirectory.po
index f0d1c9e268..8aacd3eaa2 100644
--- a/developers/locale/pt_BR/fusiondirectory.po
+++ b/developers/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr "Diagrama"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr "Diagramas"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr "Diagrama de tipos de objeto"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr "Obter"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr "Informação do cabelo"
@@ -133,6 +105,31 @@ msgstr "Plugin Demo"
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr "Diagramas"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr "Diagrama de tipos de objeto"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr "Obter"
+
+#: 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 "Direitos insuficientes"
diff --git a/developers/locale/ru/fusiondirectory.po b/developers/locale/ru/fusiondirectory.po
index d503da22c3..5492c88ad5 100644
--- a/developers/locale/ru/fusiondirectory.po
+++ b/developers/locale/ru/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-08-08 19:09+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ 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"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr "недостаточно прав"
diff --git a/developers/locale/ru@petr1708/fusiondirectory.po b/developers/locale/ru@petr1708/fusiondirectory.po
index eca6eefe68..c3fc32ff52 100644
--- a/developers/locale/ru@petr1708/fusiondirectory.po
+++ b/developers/locale/ru@petr1708/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:35+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,6 @@ 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"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/sv/fusiondirectory.po b/developers/locale/sv/fusiondirectory.po
index cd14b6a720..18abd4d076 100644
--- a/developers/locale/sv/fusiondirectory.po
+++ b/developers/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr "Diagram"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr "Diagram"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr "Objekttyps-diagram"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr "Hämta"
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr "HÃ¥rinformation"
@@ -133,6 +105,31 @@ msgstr "Demo-plugin"
 msgid "Edit some useless personal information"
 msgstr "Redigera någon meningslös personlig information"
 
+#: 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 "Diagram"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr "Objekttyps-diagram"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr "Hämta"
+
+#: 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 "Otillräckliga rättigheter"
diff --git a/developers/locale/ug/fusiondirectory.po b/developers/locale/ug/fusiondirectory.po
index 05f2ad7fed..e6bb2f1e0a 100644
--- a/developers/locale/ug/fusiondirectory.po
+++ b/developers/locale/ug/fusiondirectory.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 15:35+0000\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/vi_VN/fusiondirectory.po b/developers/locale/vi_VN/fusiondirectory.po
index 5fa57f176d..b71040e8a3 100644
--- a/developers/locale/vi_VN/fusiondirectory.po
+++ b/developers/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/developers/locale/zh/fusiondirectory.po b/developers/locale/zh/fusiondirectory.po
index e633c60e2e..30b95efb79 100644
--- a/developers/locale/zh/fusiondirectory.po
+++ b/developers/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-01-22 16:04+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 14:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:26
-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:31
-msgid "Diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:41
-msgid "Diagrams"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:45
-msgid "Object types diagram"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
-msgid "Get"
-msgstr ""
-
-#: debug-help/addons/debug-help/class_debugHelp.inc:52
-msgid "Object Types"
-msgstr ""
-
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
 msgstr ""
@@ -133,6 +105,31 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
 msgstr ""
diff --git a/dhcp/locale/ar/fusiondirectory.po b/dhcp/locale/ar/fusiondirectory.po
index 3b0106bc49..9bab5b2651 100644
--- a/dhcp/locale/ar/fusiondirectory.po
+++ b/dhcp/locale/ar/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "أنظمة"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "الإسم"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "خطأ"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "مجموعة"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ca/fusiondirectory.po b/dhcp/locale/ca/fusiondirectory.po
index 8905405638..149c5aa6ca 100644
--- a/dhcp/locale/ca/fusiondirectory.po
+++ b/dhcp/locale/ca/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Nom"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/cs_CZ/fusiondirectory.po b/dhcp/locale/cs_CZ/fusiondirectory.po
index 1d1d4767e6..a52174980c 100644
--- a/dhcp/locale/cs_CZ/fusiondirectory.po
+++ b/dhcp/locale/cs_CZ/fusiondirectory.po
@@ -1,85 +1,62 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
+msgstr "Nastavení DHCP"
+
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
+#: 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 ""
 
-#: admin/systems/class_dhcpSystem.inc:218
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "DHCP"
 msgstr "DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-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:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "služba DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "spustit službu"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "zastavit službu"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "restartovat službu"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "systémy"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Rozšířit DHCP podsíť"
@@ -96,98 +73,92 @@ msgstr "Sbalit DHCP podsíť"
 msgid "Fold"
 msgstr "Sbalit"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
-msgstr "vložit novou DHCP sekci"
+msgstr "Vložit novou DHCP sekci"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
-msgstr "název"
+msgstr "Název"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
-msgstr "globální volby"
+msgstr "Celkové předvolby"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr ""
-"Nastavení DHCP jsou neznámá. Kontaktujte prosím svého správce systémů."
+msgstr "Nastavení DHCP jsou neznámá. Kontaktujte svého správce systémů."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr "Nastavení DHCP"
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr "DHCP sekce, obsluhovaná tímto serverem"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
-msgstr "pořizování protokolovacích záznamů (logů)"
+msgstr "Protokolování"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
-msgstr "třída"
+msgstr "Třída"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
-msgstr "podtřída"
+msgstr "Podtřída"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
-msgstr "stroj"
+msgstr "Počítač"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "skupina"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "rozsah"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
-msgstr "podsíť"
+msgstr "Podsíť"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
-msgstr "záložní server"
+msgstr "Protějšek, který převezme služby v případě selhání"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
-msgstr "sdílená síť"
+msgstr "Sdílená síť"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr "klíč pro aktualizaci DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr "zóny aktualizace DNS"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -210,12 +181,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -223,7 +196,7 @@ msgstr ""
 
 #: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
 msgid "Section"
-msgstr "sekce"
+msgstr "Sekce"
 
 #: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
 msgid "Choose section type to create"
@@ -233,45 +206,100 @@ msgstr "Zvolte typ sekce, která má být vytvořena"
 msgid "Create new DHCP section"
 msgstr "Vytvořit novou sekci DHCP"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Adresní rozsah"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Síťová adresa"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -290,6 +318,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Algoritmus"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Adresní rozsah"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Síťová adresa"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -315,34 +400,53 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Fyzická adresa zařízení (MAC)"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
-msgstr "Algoritmus"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Služba DHCP"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Spustit službu"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Zastavit službu"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Restartovat službu"
+
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/de/fusiondirectory.po b/dhcp/locale/de/fusiondirectory.po
index 3bd7723af4..ae5607148c 100644
--- a/dhcp/locale/de/fusiondirectory.po
+++ b/dhcp/locale/de/fusiondirectory.po
@@ -1,85 +1,63 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2015
+# Maik Wagner <maikwagner@yahoo.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
+msgstr "DHCP-Konfiguration"
+
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
+#: 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 ""
 
-#: admin/systems/class_dhcpSystem.inc:218
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "DHCP"
 msgstr "DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-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:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "DHCP Dienst"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Dienst starten"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Dienst stoppen"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Dienst neustarten"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Systeme"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "DHCP Subnetz erweitern"
@@ -96,99 +74,92 @@ msgstr "DHCP Subnetz verwerfen"
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Füge neue DHCP-Sektion ein"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Name"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr "Globale Optionen"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr ""
-"Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren "
-"System-Administrator."
+msgstr "Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren System-Administrator."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr "DHCP-Konfiguration"
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr "Protokollierung"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "System"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Vorrat"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnetz"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr "Host für Ausfallsicherung"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr "Verteiltes Netzwerk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr "DNS-Update-Schlüssel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr "DNS-Update-Zonen"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -211,12 +182,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -234,45 +207,100 @@ msgstr "Wählen Sie den zu erzeugenden Sektions-Typ"
 msgid "Create new DHCP section"
 msgstr "Erzeuge neue DHCP-Sektion"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Bereich"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Netzwerk-Adresse"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -291,6 +319,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Algorithmus"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Bereich"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Netzwerk-Adresse"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -316,34 +401,53 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Hardware-Adresse"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
-msgstr "Algorithmus"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "DHCP Dienst"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Dienst starten"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Dienst stoppen"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Dienst neustarten"
+
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/el_GR/fusiondirectory.po b/dhcp/locale/el_GR/fusiondirectory.po
index 59465cc404..5e117671dc 100644
--- a/dhcp/locale/el_GR/fusiondirectory.po
+++ b/dhcp/locale/el_GR/fusiondirectory.po
@@ -1,85 +1,63 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
+# Manolis Saldaris <Ustramator@gmail.com>, 2015
+# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
+msgstr "Ρύθμιση DHCP"
+
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
+#: 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 ""
 
-#: admin/systems/class_dhcpSystem.inc:218
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "DHCP"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-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:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Υπηρεσία DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Εκκίνηση υπηρεσίας"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Τερματισμός υπηρεσίας"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Επανεκκίνηση υπηρεσίας"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Systems"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Επέκταση του υποδικτύου DHCP"
@@ -96,97 +74,92 @@ msgstr "Συρρίκνωση υποδικτύου DHCP"
 msgid "Fold"
 msgstr "Fold"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Εισαγωγή νέας ενότητας DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Όνομα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr "Καθολικές επιλογές"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr "Ρύθμιση DHCP"
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr "Τα τμήματα του DHCP που διαχειρίζεται αυτός ο διακομιστής."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr "Καταγραφή"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "Class"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr "Subclass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Όνομα συστήματος"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Ομάδα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Ομάδα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Υποδίκτυο"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr "Κοινόχρηστο  δίκτυο"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr "Κλειδί ενημέρωσης DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr "Ζώνες ενημέρωσης DNS"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +182,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +207,100 @@ msgstr "Επιλέξτε το είδος της ενότητας που θα δ
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Εύρος"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Διεύθυνση δικτύου"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +319,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Αλγόριθμος"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Εύρος"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Διεύθυνση δικτύου"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +401,53 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Διεύθυνση υλικού"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
-msgstr "Αλγόριθμος"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Υπηρεσία DHCP"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Εκκίνηση υπηρεσίας"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Τερματισμός υπηρεσίας"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Επανεκκίνηση υπηρεσίας"
+
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/es/fusiondirectory.po b/dhcp/locale/es/fusiondirectory.po
index d280bec78a..2f21cc8ae5 100644
--- a/dhcp/locale/es/fusiondirectory.po
+++ b/dhcp/locale/es/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
+msgstr "Configuración DHCP"
+
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
+#: 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 ""
 
-#: admin/systems/class_dhcpSystem.inc:218
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "DHCP"
 msgstr "DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-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:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Servicio DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Iniciar servicio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Parar servicio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Reiniciar servicio"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Sistemas"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,99 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva sección DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr ""
-"La configuración DHCP es desconocida. Contacte con su administrador de "
-"sistemas."
+msgstr "La configuración DHCP es desconocida. Contacte con su administrador de sistemas."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr "Configuración DHCP"
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "Clase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr "Llave de actualización DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr "Zonas de actualización DNS"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -211,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -234,45 +205,100 @@ msgstr "Seleccione el tipo de sección para crear"
 msgid "Create new DHCP section"
 msgstr "Crear una nueva sección DHCP"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Rango"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Dirección de red"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -291,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Rango"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Dirección de red"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -316,34 +399,53 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Dirección hardware"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Servicio DHCP"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Iniciar servicio"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Parar servicio"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Reiniciar servicio"
+
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/es_CO/fusiondirectory.po b/dhcp/locale/es_CO/fusiondirectory.po
index 889231ab82..640d1e433e 100644
--- a/dhcp/locale/es_CO/fusiondirectory.po
+++ b/dhcp/locale/es_CO/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "GRupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/es_VE/fusiondirectory.po b/dhcp/locale/es_VE/fusiondirectory.po
index 0b7dae85e4..a3d57f47c7 100644
--- a/dhcp/locale/es_VE/fusiondirectory.po
+++ b/dhcp/locale/es_VE/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
+msgstr "Configuración DHCP"
+
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
+#: 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 ""
 
-#: admin/systems/class_dhcpSystem.inc:218
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "DHCP"
 msgstr "DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-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:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Servicio DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Iniciar servicio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Parar servicio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Reiniciar servicio"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Sistemas"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Expandir subred DHCP"
@@ -96,99 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva sección DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr ""
-"La configuración DHCP es desconocida. Contacte con su administrador de "
-"sistemas."
+msgstr "La configuración DHCP es desconocida. Contacte con su administrador de sistemas."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr "Configuración DHCP"
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "Clase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr "Llave de actualización DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr "Zonas de actualización DNS"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -211,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -234,45 +205,100 @@ msgstr "Seleccione el tipo de sección para crear"
 msgid "Create new DHCP section"
 msgstr "Crear una nueva sección DHCP"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Rango"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Dirección de red"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -291,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Rango"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Dirección de red"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -316,34 +399,53 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Dirección hardware"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Servicio DHCP"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Iniciar servicio"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Parar servicio"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Reiniciar servicio"
+
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/fa_IR/fusiondirectory.po b/dhcp/locale/fa_IR/fusiondirectory.po
index 5a391d78de..52f4e948a4 100644
--- a/dhcp/locale/fa_IR/fusiondirectory.po
+++ b/dhcp/locale/fa_IR/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "خطا"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/fi_FI/fusiondirectory.po b/dhcp/locale/fi_FI/fusiondirectory.po
index f5303ffc49..21fa4cf56a 100644
--- a/dhcp/locale/fi_FI/fusiondirectory.po
+++ b/dhcp/locale/fi_FI/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/fr/fusiondirectory.po b/dhcp/locale/fr/fusiondirectory.po
index 7778400502..7d3c6fd585 100644
--- a/dhcp/locale/fr/fusiondirectory.po
+++ b/dhcp/locale/fr/fusiondirectory.po
@@ -1,88 +1,63 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
+# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
+# MCMic, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2016\n"
-"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-03 15:55+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-"La configuration DHCP ou sous section dans lequel cet hôte doit être ajouté"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
+msgstr "Configuration DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr "L'adresse Mac à utiliser dans l'enregistrement d'hôte DHCP"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr "Configuration du plugin dhcp"
 
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr "L'adresse IP à utiliser dans l'enregistrement d'hôte DHCP"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr "Configuration DHCP"
+
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr "Branche DHCP"
+
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr "Branches où seront stockées les configurations dhcp"
 
-#: admin/systems/class_dhcpSystem.inc:218
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "DHCP"
 msgstr "DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr "Modifier les zones DHCP d'un système"
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr "Hôtes dhcp déclarés pour ce système"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
-msgstr "Configuration DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
-msgstr ""
-"Le DN de(s) objet(s) dhcpService qui contiennent les informations de "
-"configuration"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Service DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Démarrer le service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Arrêter le Service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Redémarrer le service"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr "gestion DHCP"
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Systèmes"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Déplier le sous réseau"
@@ -99,99 +74,92 @@ msgstr "Replier le sous réseau"
 msgid "Fold"
 msgstr "Replier"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Insérer une nouvelle section DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Nom"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr "Options globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr ""
-"La configuration DHCP est inconnue. Veuillez contacter votre administrateur "
-"système."
+msgstr "La configuration DHCP est inconnue. Veuillez contacter votre administrateur système."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr "Configuration DHCP"
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr "Objets dhcp"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr "Les sections DHCP gérées par ce serveur"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr "Journaux systèmes"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "Classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr "Sous classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Hôte"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
-msgstr "Groupes"
+msgstr "Groupe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Réservoir"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Sous réseau"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr "Pair de reprise sur panne"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr "Réseau partagé"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr "Clef de mise à jour du DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr "Zones DNS à mettre à jour"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -214,12 +182,14 @@ msgid "The DHCP statements"
 msgstr "Directives DHCP"
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr "Commentaire"
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -237,52 +207,101 @@ msgstr "Choisissez le type de section à créer"
 msgid "Create new DHCP section"
 msgstr "Créer une nouvelle section DHCP"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Intervalle"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr "Serveur Principal"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
-msgstr ""
-"Les adresses IP de départ et de fin dans la plage (inclues), séparés par un "
-"trait d'union; si la plage ne contient qu'une seule adresse, alors juste "
-"l'adresse peut être spécifiée sans trait d'union. Chaque plage est définie "
-"comme une valeur distincte."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
+msgstr "Adresse IP ou nom DNS du serveur jouant le rôle de principal dans la configuration Failover et Load Balancing"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
+msgstr "Port du serveur primaire"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
-msgstr ""
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
+msgstr "Port sur lequel le serveur principal écoute les connexions de son homologue de basculement (serveur secondaire)"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
-msgstr "Taille du masque"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
+msgstr "Serveur secondaire"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
+msgstr "Adresse IP ou nom DNS du serveur jouant le rôle de serveur secondaire dans la configuration Failover et Load Balancing"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr "Port du serveur secondaire"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr "Port sur lequel le serveur secondaire écoute les connexions à partir de son homologue de basculement (serveur primaire)"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr "Délai de réponse"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr "Temps de réponse maximal en secondes, avant que le serveur suppose que la connexion au pair de basculement a échoué"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr "Mise a jour sans ACK"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr "Nombre de messages BHANDUP que le serveur peut envoyer avant qu'il reçoive BNDACK de son homologue de basculement"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
 msgstr ""
-"La longueur du masque de sous-réseau pour le sous-réseau. Le masque peut "
-"être facilement calculé à partir de cette longueur."
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Adresse réseau"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr "Configuration maximale du délai d'exécution du client en secondes, tel que défini dans DHCP Failover Protocol [FAILOVR]"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
-msgstr "Adresse réseau de ce sous-réseau"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr "Separation"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr "Partage entre les serveurs primaires et secondaires pour failover"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr " HashBucketAssignment"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr "HashBucketAssignment bit map pour le serveur DHCP, tel que défini dans DHC Load Balancing Algorithm [RFC 3074]"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
+msgstr "Temps de coupure en secondes, après quoi l'équilibre de charge est désactivé"
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
 msgid "DNS Zone Server"
@@ -300,6 +319,63 @@ msgstr "Clé Tsig"
 msgid "The TSig key DN"
 msgstr "Le DN de la clef Tsig"
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Algorithme"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr "Algorithme pour générer la clé TSIG"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr "Secret"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr "Secret pour générer TSIG Key"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr "Taille du masque"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr "La longueur du masque de sous-réseau pour le sous-réseau. Le masque peut être facilement calculé à partir de cette longueur."
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Intervalle"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr "Les adresses IP de départ et de fin dans la plage (inclues), séparés par un trait d'union; si la plage ne contient qu'une seule adresse, alors juste l'adresse peut être spécifiée sans trait d'union. Chaque plage est définie comme une valeur distincte."
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Adresse réseau"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr "Adresse réseau de ce sous-réseau"
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr "Liste de permissions"
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr "Cet attribut contient les listes de permissions associées à un pool. Chaque liste de permission est définie comme une valeur distincte."
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -325,34 +401,53 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Adresse matérielle"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
-msgstr "Algorithme"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr "Configuration DHCP"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
-msgstr "Algorithme pour générer la clé TSIG"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
+msgstr "Le DN de(s) objet(s) dhcpService qui contiennent les informations de configuration"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
-msgstr "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Service DHCP"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
-msgstr "Secret pour générer TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Démarrer le service"
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
-msgstr "Configuration du plugin dhcp"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Arrêter le Service"
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
-msgstr "Configuration DHCP"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Redémarrer le service"
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
-msgstr "Branche DHCP"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr "La configuration DHCP ou sous section dans lequel cet hôte doit être ajouté"
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
-msgstr "Branches où seront stockées les configurations dhcp"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr "L'adresse Mac à utiliser dans l'enregistrement d'hôte DHCP"
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr "L'adresse IP à utiliser dans l'enregistrement d'hôte DHCP"
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr "Modifier les zones DHCP d'un système"
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr "Zones DHCP"
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
+msgstr "Hôtes dhcp déclarés pour ce système"
diff --git a/dhcp/locale/hu_HU/fusiondirectory.po b/dhcp/locale/hu_HU/fusiondirectory.po
index 15c26dc409..d1ed65ae52 100644
--- a/dhcp/locale/hu_HU/fusiondirectory.po
+++ b/dhcp/locale/hu_HU/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Név"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/id/fusiondirectory.po b/dhcp/locale/id/fusiondirectory.po
index dd7fbf0ccc..cd4ebc115e 100644
--- a/dhcp/locale/id/fusiondirectory.po
+++ b/dhcp/locale/id/fusiondirectory.po
@@ -1,84 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -95,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -208,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -231,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -288,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -313,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/it_IT/fusiondirectory.po b/dhcp/locale/it_IT/fusiondirectory.po
index 2483776675..85971d3ea7 100644
--- a/dhcp/locale/it_IT/fusiondirectory.po
+++ b/dhcp/locale/it_IT/fusiondirectory.po
@@ -1,84 +1,62 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
+# Paola Penati <penati@avaya.com>, 2015-2016
+# Paola Penati <penati@avaya.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-03 09:38+0000\n"
+"Last-Translator: Paola Penati <penati@avaya.com>\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
+msgstr "Configurazione del DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr "Configurazione del plugin dhcp di FusionDirectory"
 
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr "Config DHCP"
+
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr "DHCP RDN"
+
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr "Ramo in cui le configurazioni DHCP saranno immagazzinate"
 
-#: admin/systems/class_dhcpSystem.inc:218
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "DHCP"
 msgstr "DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-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:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Servizio DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Avvia il servizio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Ferma il servizio"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Riavvia il servizio"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
-msgstr ""
+msgstr "Gestione DHCP"
+
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Sistemi"
 
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
@@ -96,103 +74,96 @@ msgstr "Ripiega la sottorete DHCP"
 msgid "Fold"
 msgstr "Piega"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Inserisci una nuova sezione DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr "Opzioni globali"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Errore"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr ""
-"La configurazione DHCP impostata è sconosciuta. Contatta l'amministratore "
-"del sistema."
-
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr "Configurazione del DHCP"
+msgstr "La configurazione DHCP impostata è sconosciuta. Contatta l'amministratore del sistema."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
-msgstr ""
+msgstr "Oggetti DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr "Sezioni DHCP gestite da questo server"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr "Giornale di sistema"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "Categoria"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr "Sottoclasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Gruppo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Deposito"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Sottorete"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr "Partner per la presa di controllo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr "Rete condivisa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr "Stile di aggiornamento dinamico del DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr "Aggiornamento delle zone DNS"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
-msgstr ""
+msgstr "Nome di questa configurazione DHCP"
 
 #: admin/dhcp/class_dhcpPlugin.inc:39
 msgid "Options"
@@ -200,27 +171,29 @@ msgstr "Opzioni"
 
 #: admin/dhcp/class_dhcpPlugin.inc:39
 msgid "The DHCP options"
-msgstr ""
+msgstr "Le opzioni DHCP"
 
 #: admin/dhcp/class_dhcpPlugin.inc:47
 msgid "Statements"
-msgstr ""
+msgstr "Istruzioni"
 
 #: admin/dhcp/class_dhcpPlugin.inc:47
 msgid "The DHCP statements"
-msgstr ""
+msgstr "Le istruzioni DHCP"
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
-msgstr ""
+msgstr "Commenti"
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
-msgstr ""
+msgstr "Commenti su questo oggetto DHCP"
 
 #: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
 msgid "Section"
@@ -234,71 +207,183 @@ msgstr "Scegli il tipo di sezione da creare"
 msgid "Create new DHCP section"
 msgstr "Crea una nuova sezione DHCP"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Intervallo (Range)"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr "Server primario"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
-msgstr ""
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
+msgstr "Indirizzo IP o nome DNS del server che gioca un rulo primario nel Load Balancing DHC e Fail Over"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
+msgstr "Porto primario"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
-msgstr ""
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
+msgstr "Porto su cui il server primario ascolta le connessioni dal proprio fail over peer (server secondario)"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
+msgstr "Server secondario"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
-msgstr ""
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
+msgstr "Indirizzo IP o nome DNS del server che gioca un rulo secondario nel Load Balancing DHC e Fail Over"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Indirizzo di rete"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr "Porto secondario"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
-msgstr ""
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr "Porto su cui il server secondario ascolta le connessioni dal proprio fail over peer (server primario)"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr "Tempo di risposta"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr "Ttempo di risposta massimo in secondi, prima che Server presupponga che il collegamento al failover peer non è riuscito"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr "Aggiornamenti non riscontrati"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr "Numero di messaggi BNDUPD che il server puo inviare prima di ricevere BNDACK dal proprio fail over peer"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr "Massimo Lead Time Cliente"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr "Tempo massimo di configurazione Client Lead in secondi, come definito nel Protocollo Failover [FAILOVR]"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr "Divisione"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr "Divisione tra i server primari e secondari a fini di failover"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr "HashBucketAssignment"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr "HashBucketAssignment bitmap per il server DHCP, come definito nell'Algoritmo di Bilanciamento del Carico DHC [RFC 3074]"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr "Tempo di bilanciamento del carico"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
+msgstr "Tempo di taglio in secondi, dopo di che il bilanciamento di carico viene disattivato"
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
 msgid "DNS Zone Server"
-msgstr ""
+msgstr "Zona Server DNS"
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
 msgid "Master server of the DNS Zone"
-msgstr ""
+msgstr "Server master della zona DNS"
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:40
 msgid "Tsig key"
-msgstr ""
+msgstr "Chiave di transazione"
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:40
 msgid "The TSig key DN"
-msgstr ""
+msgstr "La chiave di transazione DN"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Algoritmo"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr "Algoritmo per generare la Chiave TSIG"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr "Segreto"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr "Segreto per generare la chiave TSIG"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr "Nascondere la lunghezza"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr "La lunghezza della  maschera sottorete per la sottorete. La maschera puo essere facilmente calcolata da questa lunghezza."
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Intervallo (Range)"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr "Gli Indirizzi IP di inizio e di fine nella gamma (inclusa), separati da un trattino; se la gamma contiene un unico indirizzo, allora solo l'indirizzo puo essere specificato senza trattino. Ogni intervallo è definito come un valore distinto."
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Indirizzo di rete"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr "Indirizzo di rete di questa sottorete"
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr "Lista dei permessi"
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr "Questo attributo contiene gli elenchi di permessi associati ad un pool. Ogni lista di permessi viene definita come un valore distinto."
 
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
-msgstr ""
+msgstr "L'indirizzo hardware del cliente"
 
 #: admin/dhcp/sections/class_dhcpHost.inc:35
 msgid "The hardware address type"
-msgstr ""
+msgstr "Il tipo di indirizzo hardware"
 
 #: admin/dhcp/sections/class_dhcpHost.inc:38
 msgid "Ethernet"
@@ -316,34 +401,53 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "Indirizzo hardware"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
-msgstr "Algoritmo"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr "Configurazioni DHCP"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
-msgstr ""
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
+msgstr "DN dell'oggetto (degli oggetti) dhcpService che contiene le informazioni di configurazione"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
-msgstr ""
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Servizio DHCP"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
-msgstr ""
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Avvia il servizio"
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
-msgstr ""
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Ferma il servizio"
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
-msgstr ""
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Riavvia il servizio"
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
-msgstr ""
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr "Configurazione o sottosezione DHCP in cui va aggiunto questo host"
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
-msgstr ""
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr "Indirizzo MAC da utilizzare nella registrazione dell'host DHCP"
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr "Indirizzo IP da utilizzare nella registrazione dell'host DHCP"
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr "Modifica le zone DHCP di un sistema"
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr "Zone DHCP"
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
+msgstr "Hosts DHCP dichiarati per questo sistema"
diff --git a/dhcp/locale/lv/fusiondirectory.po b/dhcp/locale/lv/fusiondirectory.po
index 1a8c826aba..90d2fdf9e0 100644
--- a/dhcp/locale/lv/fusiondirectory.po
+++ b/dhcp/locale/lv/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Vārds "
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Kļūda"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/nb/fusiondirectory.po b/dhcp/locale/nb/fusiondirectory.po
index 4b7a01ebdd..4c4d3615fa 100644
--- a/dhcp/locale/nb/fusiondirectory.po
+++ b/dhcp/locale/nb/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Navn"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Feil"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Vert"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/nl/fusiondirectory.po b/dhcp/locale/nl/fusiondirectory.po
index dae336561f..e786747a2a 100644
--- a/dhcp/locale/nl/fusiondirectory.po
+++ b/dhcp/locale/nl/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
+msgstr "DHCP configuratie"
+
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
+#: 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 ""
 
-#: admin/systems/class_dhcpSystem.inc:218
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "DHCP"
 msgstr "DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-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:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "DHCP service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Start service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Stop service"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Restart service"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Systemen"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Vergroot DHCP subnet"
@@ -96,99 +72,92 @@ msgstr "Verklein DHCP subnet"
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Voer nieuwe DHCP sectie in"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Naam"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr "Globale opties"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Fout"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr ""
-"De ingestelde DHCP configuratie is onbekend. Neem contact op met uw "
-"systeembeheerder."
+msgstr "De ingestelde DHCP configuratie is onbekend. Neem contact op met uw systeembeheerder."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr "DHCP configuratie"
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr "Loggen"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Groep"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnet"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr "Gedeeld netwerk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr "DNS update sleutel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr "DNS update zones"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -211,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -234,45 +205,100 @@ msgstr "Selecteer het aan te maken sectie type"
 msgid "Create new DHCP section"
 msgstr "Nieuwe DHCP sectie aanmaken"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Reeks"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Netwerkadres"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -291,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Reeks"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Netwerkadres"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -316,34 +399,53 @@ msgstr "Token ring"
 msgid "Hardware address"
 msgstr "Hardware adres"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "DHCP service"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Start service"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Stop service"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Restart service"
+
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/pl/fusiondirectory.po b/dhcp/locale/pl/fusiondirectory.po
index fd75c441f4..66a7bb1405 100644
--- a/dhcp/locale/pl/fusiondirectory.po
+++ b/dhcp/locale/pl/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Uruchom usługę"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Zatrzymaj usługę"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Restartuj usługę"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Systemy"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Błąd"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "Klasa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Grupa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Adres sieciowy"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Adres sieciowy"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Uruchom usługę"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Zatrzymaj usługę"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Restartuj usługę"
+
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/pt/fusiondirectory.po b/dhcp/locale/pt/fusiondirectory.po
index c7c9067a32..707fca31dd 100644
--- a/dhcp/locale/pt/fusiondirectory.po
+++ b/dhcp/locale/pt/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Sistemas"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/pt_BR/fusiondirectory.po b/dhcp/locale/pt_BR/fusiondirectory.po
index 24182f2976..410a91fac1 100644
--- a/dhcp/locale/pt_BR/fusiondirectory.po
+++ b/dhcp/locale/pt_BR/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Serviço DHCP"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Iniciar serviço"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Parar serviço"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Reiniciar serviço"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Sistemas"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Expandir DHCP de subrede"
@@ -96,99 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Inserir nova seção DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr ""
-"A configuração de DHCP é desconhecida. Por favor, contacte seu administrador"
-" do sistema."
+msgstr "A configuração de DHCP é desconhecida. Por favor, contacte seu administrador do sistema."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr "Logando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "Classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -211,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -234,45 +205,100 @@ msgstr "Escolha um tipo de seção a ser criado"
 msgid "Create new DHCP section"
 msgstr "Criar nova seção DHCP"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Faixa de IP's"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Endereço de rede"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -291,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Faixa de IP's"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Endereço de rede"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -316,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Serviço DHCP"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Iniciar serviço"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Parar serviço"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Reiniciar serviço"
+
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ru/fusiondirectory.po b/dhcp/locale/ru/fusiondirectory.po
index e158fefc38..2528242930 100644
--- a/dhcp/locale/ru/fusiondirectory.po
+++ b/dhcp/locale/ru/fusiondirectory.po
@@ -1,85 +1,62 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
+# Alexey Matveev, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
+#: 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 ""
 
-#: admin/systems/class_dhcpSystem.inc:218
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "DHCP"
 msgstr "DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-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:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Запустить службу"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Остановить службу"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Перезапустить службу"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Системы"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +73,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Ошибка"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
-msgstr "Класс"
+msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Хост"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Группа"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +181,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +206,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Диапозон"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Сетевой адрес"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +318,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr "Алгоритм"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Диапозон"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Сетевой адрес"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +400,53 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
-msgstr "Алгоритм"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Запустить службу"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Остановить службу"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Перезапустить службу"
+
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ru@petr1708/fusiondirectory.po b/dhcp/locale/ru@petr1708/fusiondirectory.po
index 0dea6db64a..29e995f3b8 100644
--- a/dhcp/locale/ru@petr1708/fusiondirectory.po
+++ b/dhcp/locale/ru@petr1708/fusiondirectory.po
@@ -1,84 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -95,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -208,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -231,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -288,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -313,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/sv/fusiondirectory.po b/dhcp/locale/sv/fusiondirectory.po
index 672238d951..ba35978edf 100644
--- a/dhcp/locale/sv/fusiondirectory.po
+++ b/dhcp/locale/sv/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "DHCP-tjänst"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
-msgstr "Starta tjänsten"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
-msgstr "Stoppa tjänsten"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
-msgstr "Starta om tjänsten"
-
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "System"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr "Expandera DHCP-subnät"
@@ -96,97 +72,92 @@ msgstr "Minimera DHCP-subnät"
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Infoga ny DHCP-sektion"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Namn"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr "Globala inställningar"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Fel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "DHCP-konfigurationen är okänd. Kontakta systemadministratören"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr "Loggning"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "Klass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr "Subklass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Grupp"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnät"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr "Delat nätverk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr "DNS-uppdateringsnyckel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr "DNS-uppdateringszoner"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr "Välj sektionstyp att skapa"
 msgid "Create new DHCP section"
 msgstr "Skapa ny DHCP-sektion"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
-msgstr "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "Nätverksadress"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr "Range"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "Nätverksadress"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr "Token Ring"
 msgid "Hardware address"
 msgstr "HÃ¥rdvaruadress"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "DHCP-tjänst"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
+msgstr "Starta tjänsten"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
+msgstr "Stoppa tjänsten"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
+msgstr "Starta om tjänsten"
+
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ug/fusiondirectory.po b/dhcp/locale/ug/fusiondirectory.po
index e060f693f3..98f95901b0 100644
--- a/dhcp/locale/ug/fusiondirectory.po
+++ b/dhcp/locale/ug/fusiondirectory.po
@@ -1,84 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -95,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -208,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -231,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -288,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -313,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/vi_VN/fusiondirectory.po b/dhcp/locale/vi_VN/fusiondirectory.po
index ed8ade50f6..57f78838bf 100644
--- a/dhcp/locale/vi_VN/fusiondirectory.po
+++ b/dhcp/locale/vi_VN/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "Các hệ thống"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "Tên"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "Nhóm "
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/zh/fusiondirectory.po b/dhcp/locale/zh/fusiondirectory.po
index 44fcd36fe3..3372823f31 100644
--- a/dhcp/locale/zh/fusiondirectory.po
+++ b/dhcp/locale/zh/fusiondirectory.po
@@ -1,85 +1,61 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
+"Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 21:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
-"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid ""
-"The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:485
+#: admin/dhcp/class_dhcpConfiguration.inc:486
+#: admin/dhcp/class_dhcpConfiguration.inc:488
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr "系统设置"
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -96,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:247
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr "名称"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:373
+#: admin/dhcp/class_dhcpConfiguration.inc:414
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid "Error"
 msgstr "错误"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:429
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:502
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:512
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Class"
 msgstr "ç±»"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:528
 msgid "Group"
 msgstr "组"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:529
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:530
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:531
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:532
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:533
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:534
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -209,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -232,45 +205,100 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit"
-" list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer"
+" (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
-msgid "Mask length"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
 msgid ""
-"The subnet mask length for the subnet. The mask can be easily computed from "
-"this length."
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address"
-msgstr "网络地址"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
-msgid "Network address of this subnet"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:36
@@ -289,6 +317,63 @@ msgstr ""
 msgid "The TSig key DN"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid "Mask length"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+msgid ""
+"The subnet mask length for the subnet. The mask can be easily computed from "
+"this length."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be"
+" specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address"
+msgstr "网络地址"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+msgid "Network address of this subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit"
+" list is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpHost.inc:32
 #: admin/dhcp/sections/class_dhcpHost.inc:41
 msgid "The client hardware address"
@@ -314,34 +399,53 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:217
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:231
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:235
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dns/locale/ar/fusiondirectory.po b/dns/locale/ar/fusiondirectory.po
index 253ff9e973..2fcab59dca 100644
--- a/dns/locale/ar/fusiondirectory.po
+++ b/dns/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "خطأ"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "أنظمة"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "أنظمة"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "خطأ"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/ca/fusiondirectory.po b/dns/locale/ca/fusiondirectory.po
index 19688ee689..2ae8fa582d 100644
--- a/dns/locale/ca/fusiondirectory.po
+++ b/dns/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Error"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/cs_CZ/fusiondirectory.po b/dns/locale/cs_CZ/fusiondirectory.po
index c460b57818..48a5394115 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -18,77 +18,57 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr "DNS"
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr "DNS zóny"
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr "Nastavení DNS"
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
+msgstr "Nastavení zásuvného modulu dns pro FusionDirectory"
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
+msgstr "Nastavení DNS"
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
-msgstr ""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
+msgstr "Domény ukládat včetně teček na samém konci"
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
+msgstr "Má F.D ukládat tečku úplně na konci domény?"
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Chyba"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -129,10 +109,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr "DNS zóny"
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr "DNS"
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Systémy"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -394,31 +390,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -553,41 +524,70 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Systémy"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
-msgstr "Nastavení DNS"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
-msgstr "Nastavení zásuvného modulu dns pro FusionDirectory"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
-msgstr "Nastavení DNS"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
-msgstr "Domény ukládat včetně teček na samém konci"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
-msgstr "Má F.D ukládat tečku úplně na konci domény?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Chyba"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
+msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
diff --git a/dns/locale/de/fusiondirectory.po b/dns/locale/de/fusiondirectory.po
index d6a21de6cb..03b2ba53fe 100644
--- a/dns/locale/de/fusiondirectory.po
+++ b/dns/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,77 +18,57 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr "DNS"
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr "DNS-Zonen"
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr "DNS-Konfiguration"
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
+msgstr "FusionDirectory dns Pluginkonfiguration"
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
+msgstr "DNS Konfiguration"
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
-msgstr ""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
+msgstr "Letzten Punkt in Domains speichern"
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
+msgstr "Soll FD einen letzten Punkt am Ende von Domains speichern?"
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Fehler"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -129,10 +109,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr "DNS-Zonen"
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr "DNS"
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Systeme"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -394,31 +390,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -553,41 +524,70 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Systeme"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
-msgstr "DNS-Konfiguration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
-msgstr "FusionDirectory dns Pluginkonfiguration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
-msgstr "DNS Konfiguration"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
-msgstr "Letzten Punkt in Domains speichern"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
-msgstr "Soll FD einen letzten Punkt am Ende von Domains speichern?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Fehler"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
+msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
diff --git a/dns/locale/el_GR/fusiondirectory.po b/dns/locale/el_GR/fusiondirectory.po
index a67061a55f..01a7313ce2 100644
--- a/dns/locale/el_GR/fusiondirectory.po
+++ b/dns/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -19,77 +19,57 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr "DNS"
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr "Ζώνες DNS"
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr "Ρύθμιση DNS"
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory dns "
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
+msgstr "Ρύθμιση DNS"
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
-msgstr ""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
+msgstr "Αποθήκευση τελικής τελείας στα domains"
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -130,10 +110,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr "Ζώνες DNS"
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr "DNS"
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Systems"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -395,31 +391,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -554,40 +525,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
-msgstr "Ρύθμιση DNS"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory dns "
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
-msgstr "Ρύθμιση DNS"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
-msgstr "Αποθήκευση τελικής τελείας στα domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/es/fusiondirectory.po b/dns/locale/es/fusiondirectory.po
index 29e3429fbb..d911756d9d 100644
--- a/dns/locale/es/fusiondirectory.po
+++ b/dns/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr "DNS"
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr "Configuración DNS"
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr "DNS"
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Sistemas"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Sistemas"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
-msgstr "Configuración DNS"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Error"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/es_CO/fusiondirectory.po b/dns/locale/es_CO/fusiondirectory.po
index b77fc7e602..162bafb6fb 100644
--- a/dns/locale/es_CO/fusiondirectory.po
+++ b/dns/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Error"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/es_VE/fusiondirectory.po b/dns/locale/es_VE/fusiondirectory.po
index 8e68d01514..46689e2b74 100644
--- a/dns/locale/es_VE/fusiondirectory.po
+++ b/dns/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr "DNS"
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr "Configuración DNS"
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr "DNS"
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Sistemas"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Sistemas"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
-msgstr "Configuración DNS"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Error"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/fa_IR/fusiondirectory.po b/dns/locale/fa_IR/fusiondirectory.po
index 3be0dcff17..8301355a29 100644
--- a/dns/locale/fa_IR/fusiondirectory.po
+++ b/dns/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "خطا"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "خطا"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/fi_FI/fusiondirectory.po b/dns/locale/fi_FI/fusiondirectory.po
index f6721ea27b..2dec097280 100644
--- a/dns/locale/fi_FI/fusiondirectory.po
+++ b/dns/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-14 18:38+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Virhe"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Virhe"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/fr/fusiondirectory.po b/dns/locale/fr/fusiondirectory.po
index 72ab6898ed..6240c5cbb1 100644
--- a/dns/locale/fr/fusiondirectory.po
+++ b/dns/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -19,78 +19,58 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr "DNS"
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr "Modifier les zones DNS d'un système"
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr "Zones DNS"
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr "zones DNS pour cet hôte"
-
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
-msgstr "enregistrements SOA"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr "Configuration DNS"
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
-msgstr "enregistrements DNS"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
+msgstr "Configuration du plugin DNS"
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
-msgstr "Serveurs primaires"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
+msgstr "Configuration DNS"
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
-msgstr "Les enregistrements DNS pour la zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
+msgstr "DNS RDN"
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
-msgstr "Le serveur principal pour la zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
+msgstr "Branche dans laquelle les zones DNS seront stockés"
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr "Impossible de lancer ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
+msgstr "Stocker le point final dans les domaines"
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr "Ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
+msgstr "Est ce que FusionDirectory doit stocker un point final à la fin des domaines ?"
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr "LDAP2Zone appelé pour la zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
+msgstr "Acl dns"
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Erreur"
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
+msgstr "Acl"
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr "Le client Argonaut doit être activé pour utiliser ldap2zone à distance"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
+msgstr "Nom de l'acl"
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
-msgstr "%d enregistrements ont été mis à jour à partir de %s vers %s dans la zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
+msgstr "Nom de cette acl"
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
-msgstr "%d enregistrements ont été enlevés dans la zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
+msgstr "Liste d'adresse pour cette ACL"
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
-msgstr "mise à jour DNS"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
+msgstr "La liste de correspondance d'adresse IP pour cette acl"
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
 #: admin/dns/class_dnsView.inc:31
@@ -130,10 +110,26 @@ msgstr "Match recursive only"
 msgid "Match only recursive queries in this view"
 msgstr "Accepter uniquement les requêtes récursives dans cette vue"
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr "Zones DNS"
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr "zones DNS dans cette vue"
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr "DNS"
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr "Gestion des DNS"
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Systèmes"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -395,31 +391,6 @@ msgstr "Contenu de cet enregistrement"
 msgid "The entered IP does not match the selected reverse zone"
 msgstr "L'adresse IP saisie ne correspond pas à la zone inverse sélectionnée"
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr "Acl dns"
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr "Acl"
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr "Nom de l'acl"
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr "Nom de cette acl"
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr "Liste d'adresse pour cette ACL"
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr "La liste de correspondance d'adresse IP pour cette acl"
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr "sous-domaine"
@@ -554,41 +525,70 @@ msgstr "Enregistrements"
 msgid "The DNS records for this zone"
 msgstr "Les enregistrements DNS pour cette zone"
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
-msgstr "Gestion des DNS"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
+msgstr "Modifier les zones DNS d'un système"
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Systèmes"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr "zones DNS pour cet hôte"
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
-msgstr "Configuration DNS"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
+msgstr "enregistrements SOA"
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
-msgstr "Configuration du plugin DNS"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
+msgstr "enregistrements DNS"
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
-msgstr "Configuration DNS"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
+msgstr "Serveurs primaires"
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
-msgstr "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
+msgstr "Les enregistrements DNS pour la zone \"%s\""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
-msgstr "Branche dans laquelle les zones DNS seront stockés"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
+msgstr "Le serveur principal pour la zone \"%s\""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
-msgstr "Stocker le point final dans les domaines"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
+msgstr "Impossible de lancer ldap2zone"
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
-msgstr "Est ce que FusionDirectory doit stocker un point final à la fin des domaines ?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr "Ldap2zone"
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr "LDAP2Zone appelé pour la zone \"%s\""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Erreur"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr "Le client Argonaut doit être activé pour utiliser ldap2zone à distance"
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr "%d enregistrements ont été mis à jour à partir de %s vers %s dans la zone %s"
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr "%d enregistrements ont été enlevés dans la zone %s"
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
+msgstr "mise à jour DNS"
 
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
diff --git a/dns/locale/hu_HU/fusiondirectory.po b/dns/locale/hu_HU/fusiondirectory.po
index 954eff9113..9ccfa4bda4 100644
--- a/dns/locale/hu_HU/fusiondirectory.po
+++ b/dns/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/id/fusiondirectory.po b/dns/locale/id/fusiondirectory.po
index 946acd6d9e..1aad8d3f2e 100644
--- a/dns/locale/id/fusiondirectory.po
+++ b/dns/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/it_IT/fusiondirectory.po b/dns/locale/it_IT/fusiondirectory.po
index 3f4fab0e6e..ed866c03f0 100644
--- a/dns/locale/it_IT/fusiondirectory.po
+++ b/dns/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:21+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,78 +19,58 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr "DNS"
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr "Modificare le zone DNS di un sistema"
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr "Zone DNS"
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr "Zone DNS per questo host"
-
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
-msgstr "Record SOA"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr "Configurazione del DNS"
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
-msgstr "Records DNS"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
+msgstr "Configurazione del plugin DNS di FusionDirectory"
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
-msgstr "Servers primari"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
+msgstr "Configurazione del DNS"
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
-msgstr "Records DNS par la zona \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
+msgstr "DNS RDN"
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
-msgstr "Server primario per la zona \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
+msgstr "Ramo nel quale le zone DNS verranno immagazzinate"
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
-msgstr "Impossibile ottenere run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
+msgstr "COnservare punto finale in domini"
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr "Zona LDAP2"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
+msgstr "Dovrebbe FD memorizzare un punto al termine dei domini ?"
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
-msgstr "Ldap2Zone chiamata per la zona \"%s\""
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
+msgstr "ACL DNS"
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Errore"
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
+msgstr "ACL"
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr "Il cliente Argonaut dev'essere attivato per utilizzare ldap2zone a distanza"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
+msgstr "Nome ACL"
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
-msgstr "%d records sono stati aggiornati da %s a %s nella zona %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
+msgstr "Nome di questa ACL"
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
-msgstr "%d records sono stati rimossi nella zona %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
+msgstr "Indirizzo abbinamento lista"
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
-msgstr "Aggiornamento DNS"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
+msgstr "L'indirizzo IP abbinamento lista per questa ACL"
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
 #: admin/dns/class_dnsView.inc:31
@@ -130,10 +110,26 @@ msgstr "Abbinamento query ricorsive"
 msgid "Match only recursive queries in this view"
 msgstr "Abbinare solo le query ricorsive in questa vista"
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr "Zone DNS"
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr "Zone DNS in questa vista"
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr "DNS"
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr "Gestione DNS"
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Sistemi"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -395,31 +391,6 @@ msgstr "Contenuto di questo record"
 msgid "The entered IP does not match the selected reverse zone"
 msgstr "L'IP immesso non corrisponde alla zona inversa selezionata"
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr "ACL DNS"
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr "ACL"
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr "Nome ACL"
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr "Nome di questa ACL"
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr "Indirizzo abbinamento lista"
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr "L'indirizzo IP abbinamento lista per questa ACL"
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr "Sottodominio"
@@ -554,41 +525,70 @@ msgstr "Records"
 msgid "The DNS records for this zone"
 msgstr "Records DNS per questa zona"
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
-msgstr "Gestione DNS"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
+msgstr "Modificare le zone DNS di un sistema"
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Sistemi"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr "Zone DNS per questo host"
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
-msgstr "Configurazione del DNS"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
+msgstr "Record SOA"
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
-msgstr "Configurazione del plugin DNS di FusionDirectory"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
+msgstr "Records DNS"
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
-msgstr "Configurazione del DNS"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
+msgstr "Servers primari"
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
-msgstr "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
+msgstr "Records DNS par la zona \"%s\""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
-msgstr "Ramo nel quale le zone DNS verranno immagazzinate"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
+msgstr "Server primario per la zona \"%s\""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
-msgstr "COnservare punto finale in domini"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
+msgstr "Impossibile ottenere run ldap2zone"
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
-msgstr "Dovrebbe FD memorizzare un punto al termine dei domini ?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr "Zona LDAP2"
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr "Ldap2Zone chiamata per la zona \"%s\""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Errore"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr "Il cliente Argonaut dev'essere attivato per utilizzare ldap2zone a distanza"
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr "%d records sono stati aggiornati da %s a %s nella zona %s"
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr "%d records sono stati rimossi nella zona %s"
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
+msgstr "Aggiornamento DNS"
 
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
diff --git a/dns/locale/lv/fusiondirectory.po b/dns/locale/lv/fusiondirectory.po
index 0e0fb47770..5c6a25423c 100644
--- a/dns/locale/lv/fusiondirectory.po
+++ b/dns/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Kļūda"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Kļūda"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/nb/fusiondirectory.po b/dns/locale/nb/fusiondirectory.po
index 7de24960fc..cb90911891 100644
--- a/dns/locale/nb/fusiondirectory.po
+++ b/dns/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Feil"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Feil"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/nl/fusiondirectory.po b/dns/locale/nl/fusiondirectory.po
index 349908b242..5a09019105 100644
--- a/dns/locale/nl/fusiondirectory.po
+++ b/dns/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr "DNS"
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr "DNS configuratie"
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Fout"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr "DNS"
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Systemen"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Systemen"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
-msgstr "DNS configuratie"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Fout"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/pl/fusiondirectory.po b/dns/locale/pl/fusiondirectory.po
index cc877d06f2..9622a9aaf5 100644
--- a/dns/locale/pl/fusiondirectory.po
+++ b/dns/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr "DNS"
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Błąd"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr "DNS"
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Systemy"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Systemy"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Błąd"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/pt/fusiondirectory.po b/dns/locale/pt/fusiondirectory.po
index d54062cc47..f0a436bebe 100644
--- a/dns/locale/pt/fusiondirectory.po
+++ b/dns/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Erro"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Sistemas"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Sistemas"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Erro"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/pt_BR/fusiondirectory.po b/dns/locale/pt_BR/fusiondirectory.po
index 4927127fba..d76bbcee98 100644
--- a/dns/locale/pt_BR/fusiondirectory.po
+++ b/dns/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr "Configuração DNS"
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Erro"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Sistemas"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Sistemas"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
-msgstr "Configuração DNS"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Erro"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/ru/fusiondirectory.po b/dns/locale/ru/fusiondirectory.po
index c8627bc912..c84ececc8e 100644
--- a/dns/locale/ru/fusiondirectory.po
+++ b/dns/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-08 19:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -18,78 +18,58 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr "DNS"
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr "Редактировать DNS зоны системы"
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr "Зоны DNS"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr "Конфигурация DNS"
 
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr "DNS зоны хоста"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
+msgstr "FusionDirectory конфигурация dns плагина"
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
-msgstr "SOA записи"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
+msgstr "Конфигурация DNS"
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
-msgstr "DNS записи"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
+msgstr "DNS RDN"
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
-msgstr "Первичные сервера"
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
+msgstr "Ветка в которой DNS зоны будут сохранены"
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
-msgstr "DNS записи для зоны \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
+msgstr "Сохранять точку в конце доменов"
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
-msgstr "Первичный сервер для зоны \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
+msgstr "Должен ли FD сохранять точку на конце доменов?"
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
-msgstr "Ldap2zone"
-
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Ошибка"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
-msgstr "Количество записей, обновленных с %s на %s в зоне %s - %d"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
+msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
-msgstr "%d записей было удалено в зоне %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
+msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
-msgstr "Обновить DNS"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
+msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
 #: admin/dns/class_dnsView.inc:31
@@ -129,10 +109,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr "Зоны DNS"
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr "DNS"
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr "Управление DNS"
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Системы"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -394,31 +390,6 @@ msgstr "Содержимое записи"
 msgid "The entered IP does not match the selected reverse zone"
 msgstr "Введенный IP не соответствует выбранной обратной зоне"
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr "Поддомен "
@@ -553,41 +524,70 @@ msgstr "Записи"
 msgid "The DNS records for this zone"
 msgstr "DNS записи зоны"
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
-msgstr "Управление DNS"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
+msgstr "Редактировать DNS зоны системы"
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Системы"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr "DNS зоны хоста"
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
-msgstr "Конфигурация DNS"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
+msgstr "SOA записи"
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
-msgstr "FusionDirectory конфигурация dns плагина"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
+msgstr "DNS записи"
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
-msgstr "Конфигурация DNS"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
+msgstr "Первичные сервера"
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
-msgstr "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
+msgstr "DNS записи для зоны \"%s\""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
-msgstr "Ветка в которой DNS зоны будут сохранены"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
+msgstr "Первичный сервер для зоны \"%s\""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
-msgstr "Сохранять точку в конце доменов"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
-msgstr "Должен ли FD сохранять точку на конце доменов?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr "Ldap2zone"
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Ошибка"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr "Количество записей, обновленных с %s на %s в зоне %s - %d"
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr "%d записей было удалено в зоне %s"
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
+msgstr "Обновить DNS"
 
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
diff --git a/dns/locale/ru@petr1708/fusiondirectory.po b/dns/locale/ru@petr1708/fusiondirectory.po
index 5797f7f235..0c4841acb0 100644
--- a/dns/locale/ru@petr1708/fusiondirectory.po
+++ b/dns/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/sv/fusiondirectory.po b/dns/locale/sv/fusiondirectory.po
index fca15528f4..adf37000d4 100644
--- a/dns/locale/sv/fusiondirectory.po
+++ b/dns/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Fel"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "System"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "System"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Fel"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/ug/fusiondirectory.po b/dns/locale/ug/fusiondirectory.po
index fcd6968728..7b180d3a11 100644
--- a/dns/locale/ug/fusiondirectory.po
+++ b/dns/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/vi_VN/fusiondirectory.po b/dns/locale/vi_VN/fusiondirectory.po
index b7fb0a7656..5d04da10e9 100644
--- a/dns/locale/vi_VN/fusiondirectory.po
+++ b/dns/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "Lá»—i"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "Các hệ thống"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "Các hệ thống"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "Lá»—i"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dns/locale/zh/fusiondirectory.po b/dns/locale/zh/fusiondirectory.po
index 64d724afb9..9374214e81 100644
--- a/dns/locale/zh/fusiondirectory.po
+++ b/dns/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,77 +17,57 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/class_dnsHost.inc:121 admin/dns/class_dnsManagement.inc:34
-msgid "DNS"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:122
-msgid "Edit the DNS zones of a system"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:139 admin/dns/class_dnsView.inc:66
-msgid "DNS zones"
-msgstr ""
-
-#: admin/systems/class_dnsHost.inc:143
-msgid "DNS zones for this host"
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
-msgid "SOA records"
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
-msgid "DNS Records"
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:188
-msgid "Primary servers"
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:204
-#, php-format
-msgid "The DNS records for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:225
-#, php-format
-msgid "The primary server for zone \"%s\""
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
-msgid "Could not get run ldap2zone"
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-msgid "Ldap2zone"
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:277
-#, php-format
-msgid "Ldap2Zone called for zone \"%s\""
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:281
-msgid "Error"
-msgstr "错误"
-
-#: admin/systems/class_dnsHost.inc:281
-msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
-#, php-format
-msgid "%d records were updated from %s to %s in zone %s"
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:346
-#, php-format
-msgid "%d records were removed in zone %s"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:355
-msgid "DNS update"
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
 msgstr ""
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
@@ -128,10 +108,26 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+msgid "DNS zones"
+msgstr ""
+
 #: admin/dns/class_dnsView.inc:66
 msgid "DNS zones in this view"
 msgstr ""
 
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr "系统设置"
+
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
@@ -393,31 +389,6 @@ msgstr ""
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
-#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
-#: admin/dns/class_dnsAcl.inc:33
-msgid "DNS acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:47
-msgid "Acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "ACL name"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:51
-msgid "Name of this acl"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "Address match list"
-msgstr ""
-
-#: admin/dns/class_dnsAcl.inc:56
-msgid "The ip address match list for this acl"
-msgstr ""
-
 #: admin/dns/class_dnsZone.inc:31
 msgid "Subdomain"
 msgstr ""
@@ -552,40 +523,69 @@ msgstr ""
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:35
-msgid "DNS Management"
+#: admin/systems/class_dnsHost.inc:122
+msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:37
-msgid "Systems"
-msgstr "系统设置"
+#: admin/systems/class_dnsHost.inc:143
+msgid "DNS zones for this host"
+msgstr ""
 
-#: config/dns/class_dnsConfig.inc:28
-msgid "DNS configuration"
+#: admin/systems/class_dnsHost.inc:150
+msgid "SOA records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:29
-msgid "FusionDirectory dns plugin configuration"
+#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:192
+msgid "DNS Records"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:42
-msgid "DNS config"
+#: admin/systems/class_dnsHost.inc:188
+msgid "Primary servers"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "DNS RDN"
+#: admin/systems/class_dnsHost.inc:204
+#, php-format
+msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:45
-msgid "Branch in which DNS zones will be stored"
+#: admin/systems/class_dnsHost.inc:225
+#, php-format
+msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Store final dot in domains"
+#: admin/systems/class_dnsHost.inc:269 admin/systems/class_dnsHost.inc:275
+msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: config/dns/class_dnsConfig.inc:50
-msgid "Should FD store a final dot at the end of domains?"
+#: admin/systems/class_dnsHost.inc:277
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:277
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Error"
+msgstr "错误"
+
+#: admin/systems/class_dnsHost.inc:281
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:311 admin/systems/class_dnsHost.inc:331
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:346
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:355
+msgid "DNS update"
 msgstr ""
 
 #: admin/systems/dnsrecords.tpl.c:2
diff --git a/dovecot/locale/ar/fusiondirectory.po b/dovecot/locale/ar/fusiondirectory.po
index e13406b8f1..b9f282910e 100644
--- a/dovecot/locale/ar/fusiondirectory.po
+++ b/dovecot/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/ca/fusiondirectory.po b/dovecot/locale/ca/fusiondirectory.po
index 9aed3cfa0d..3e592bea29 100644
--- a/dovecot/locale/ca/fusiondirectory.po
+++ b/dovecot/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/cs_CZ/fusiondirectory.po b/dovecot/locale/cs_CZ/fusiondirectory.po
index 1d747e07af..1edadb80ca 100644
--- a/dovecot/locale/cs_CZ/fusiondirectory.po
+++ b/dovecot/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Nejsou určeny žádné poštovní servery slučitelné s protokolem IMAP! "
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr "Poštovní server pro tento účet je neplatný!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr "Chyba při pokusu kontaktovat Dovecot server prostřednictvím Argonaut: %s"
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr "Pro vytvoření e-mailové schránky uživatele na Dovecot serveru použijte argonaut"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Nejsou určeny žádné poštovní servery slučitelné s protokolem IMAP! "
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr "Poštovní server pro tento účet je neplatný!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr "Chyba při pokusu kontaktovat Dovecot server prostřednictvím Argonaut: %s"
diff --git a/dovecot/locale/de/fusiondirectory.po b/dovecot/locale/de/fusiondirectory.po
index 654ca7df3f..fde8fa1abd 100644
--- a/dovecot/locale/de/fusiondirectory.po
+++ b/dovecot/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Es sind keine IMAP-kompatible Mail-Server definiert!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr "Der Mail-Server für dieses Konto ist ungültig!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Es sind keine IMAP-kompatible Mail-Server definiert!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr "Der Mail-Server für dieses Konto ist ungültig!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/el_GR/fusiondirectory.po b/dovecot/locale/el_GR/fusiondirectory.po
index f6edd15603..98b314cbf3 100644
--- a/dovecot/locale/el_GR/fusiondirectory.po
+++ b/dovecot/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,19 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Δεν έχουν ορισθεί συμβατοί διακομιστές αλληλογραφίας IMAP!"
+
+#: 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 "Σφάλμα κατά την προσπάθεια επικοινωνίας με τον διακομιστή Dovecot μέσω του Argonaut: %s"
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -106,16 +119,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr "Χρήση argonaut για δημιουργία του γραμματοκιβωτίου χρήστη στον διακομιστή Dovecot"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Δεν έχουν ορισθεί συμβατοί διακομιστές αλληλογραφίας IMAP!"
-
-#: 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 "Σφάλμα κατά την προσπάθεια επικοινωνίας με τον διακομιστή Dovecot μέσω του Argonaut: %s"
diff --git a/dovecot/locale/es/fusiondirectory.po b/dovecot/locale/es/fusiondirectory.po
index bcbfa79df7..4e6a7a36d2 100644
--- a/dovecot/locale/es/fusiondirectory.po
+++ b/dovecot/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "¡No se han definido servidores IMAP compatibles!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr "¡El servidor de correo para esta cuenta no es válido!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "¡No se han definido servidores IMAP compatibles!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr "¡El servidor de correo para esta cuenta no es válido!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/es_CO/fusiondirectory.po b/dovecot/locale/es_CO/fusiondirectory.po
index b8761e1872..e99e1dbfa9 100644
--- a/dovecot/locale/es_CO/fusiondirectory.po
+++ b/dovecot/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/es_VE/fusiondirectory.po b/dovecot/locale/es_VE/fusiondirectory.po
index 9b7f98a1c2..4f3da5a4e2 100644
--- a/dovecot/locale/es_VE/fusiondirectory.po
+++ b/dovecot/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "¡No se han definido servidores IMAP compatibles!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr "¡El servidor de correo para esta cuenta no es válido!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "¡No se han definido servidores IMAP compatibles!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr "¡El servidor de correo para esta cuenta no es válido!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/fa_IR/fusiondirectory.po b/dovecot/locale/fa_IR/fusiondirectory.po
index 3140aebb58..9f7ed6d009 100644
--- a/dovecot/locale/fa_IR/fusiondirectory.po
+++ b/dovecot/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/fi_FI/fusiondirectory.po b/dovecot/locale/fi_FI/fusiondirectory.po
index 203ef552e1..15221a7d72 100644
--- a/dovecot/locale/fi_FI/fusiondirectory.po
+++ b/dovecot/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:39+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/fr/fusiondirectory.po b/dovecot/locale/fr/fusiondirectory.po
index 1279228eb0..70f5924252 100644
--- a/dovecot/locale/fr/fusiondirectory.po
+++ b/dovecot/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:17+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -19,6 +19,19 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Il n'y a aucun serveur IMAP compatible défini !"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr "Le serveur de courriel pour ce compte est invalide !"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr "Erreur lors de la connexion au serveur Dovecot via Argonaut : %s"
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -107,16 +120,3 @@ msgstr "Créer le répertoire utilisateur via Argonaut"
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr "Utiliser Argonaut pour créer la boite courriel sur le serveur Dovecot"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Il n'y a aucun serveur IMAP compatible défini !"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr "Le serveur de courriel pour ce compte est invalide !"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr "Erreur lors de la connexion au serveur Dovecot via Argonaut : %s"
diff --git a/dovecot/locale/hu_HU/fusiondirectory.po b/dovecot/locale/hu_HU/fusiondirectory.po
index 081aa2f1cd..ed0414a180 100644
--- a/dovecot/locale/hu_HU/fusiondirectory.po
+++ b/dovecot/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/id/fusiondirectory.po b/dovecot/locale/id/fusiondirectory.po
index e710c74cd4..1397864866 100644
--- a/dovecot/locale/id/fusiondirectory.po
+++ b/dovecot/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/it_IT/fusiondirectory.po b/dovecot/locale/it_IT/fusiondirectory.po
index 4a793cd7c2..88cb8bd33d 100644
--- a/dovecot/locale/it_IT/fusiondirectory.po
+++ b/dovecot/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:22+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -18,6 +18,19 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Non è stato definito nessun server IMAP compatibile !"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr "Il server di posta elettronica di questo account non è valido !"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr "Errore durante il tentativo di contattare il server Dovecot attraverso Argonaut: %s"
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -106,16 +119,3 @@ msgstr "Creare la cartella dell'utente usando Argonaut"
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr "Usare Argonaut per creare la mailbox dell'utente sul server Dovecot"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Non è stato definito nessun server IMAP compatibile !"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr "Il server di posta elettronica di questo account non è valido !"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr "Errore durante il tentativo di contattare il server Dovecot attraverso Argonaut: %s"
diff --git a/dovecot/locale/lv/fusiondirectory.po b/dovecot/locale/lv/fusiondirectory.po
index d44b0229ed..ac01280152 100644
--- a/dovecot/locale/lv/fusiondirectory.po
+++ b/dovecot/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/nb/fusiondirectory.po b/dovecot/locale/nb/fusiondirectory.po
index 18db9ec630..772908876e 100644
--- a/dovecot/locale/nb/fusiondirectory.po
+++ b/dovecot/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/nl/fusiondirectory.po b/dovecot/locale/nl/fusiondirectory.po
index 87db76f031..9b7e673042 100644
--- a/dovecot/locale/nl/fusiondirectory.po
+++ b/dovecot/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Er zijn geen IMAP compatibele mail servers gedefinieerd!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr "Mail server voor deze account is niet geldig!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Er zijn geen IMAP compatibele mail servers gedefinieerd!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr "Mail server voor deze account is niet geldig!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/pl/fusiondirectory.po b/dovecot/locale/pl/fusiondirectory.po
index 7bbb757090..a3ebe3f3d9 100644
--- a/dovecot/locale/pl/fusiondirectory.po
+++ b/dovecot/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/pt/fusiondirectory.po b/dovecot/locale/pt/fusiondirectory.po
index 0b42d2f936..16260b5c79 100644
--- a/dovecot/locale/pt/fusiondirectory.po
+++ b/dovecot/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/pt_BR/fusiondirectory.po b/dovecot/locale/pt_BR/fusiondirectory.po
index 06af2fc5dc..f1d8a86ff2 100644
--- a/dovecot/locale/pt_BR/fusiondirectory.po
+++ b/dovecot/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Não existem servidores de correio IMAP compatíveis!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr "Servidor de correio para esta conta é inválido!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Não existem servidores de correio IMAP compatíveis!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr "Servidor de correio para esta conta é inválido!"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/ru/fusiondirectory.po b/dovecot/locale/ru/fusiondirectory.po
index e1fd7bda3e..bb991022ca 100644
--- a/dovecot/locale/ru/fusiondirectory.po
+++ b/dovecot/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-24 12:43+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -19,6 +19,19 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr "Не определен IMAP совместимый почтовый сервер!"
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -107,16 +120,3 @@ msgstr "Создавать папки пользователей через Argo
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr "Использовать argonaut для создания почтовых ящиков пользователей на сервере Dovecot"
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Не определен IMAP совместимый почтовый сервер!"
-
-#: 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/ru@petr1708/fusiondirectory.po b/dovecot/locale/ru@petr1708/fusiondirectory.po
index 9e7d976d48..7283bd4a2e 100644
--- a/dovecot/locale/ru@petr1708/fusiondirectory.po
+++ b/dovecot/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/sv/fusiondirectory.po b/dovecot/locale/sv/fusiondirectory.po
index a9c16543ec..92da055648 100644
--- a/dovecot/locale/sv/fusiondirectory.po
+++ b/dovecot/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/ug/fusiondirectory.po b/dovecot/locale/ug/fusiondirectory.po
index abc46ce633..15a12d93ac 100644
--- a/dovecot/locale/ug/fusiondirectory.po
+++ b/dovecot/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/vi_VN/fusiondirectory.po b/dovecot/locale/vi_VN/fusiondirectory.po
index 568b261800..58a429fcd9 100644
--- a/dovecot/locale/vi_VN/fusiondirectory.po
+++ b/dovecot/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dovecot/locale/zh/fusiondirectory.po b/dovecot/locale/zh/fusiondirectory.po
index c179c94953..186186234d 100644
--- a/dovecot/locale/zh/fusiondirectory.po
+++ b/dovecot/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 16:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,19 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
+
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
@@ -105,16 +118,3 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
 msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
-msgid "There are no IMAP compatible mail servers defined!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
-#, php-format
-msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
diff --git a/dsa/locale/ar/fusiondirectory.po b/dsa/locale/ar/fusiondirectory.po
index 8fef6ec45b..939a7e0efb 100644
--- a/dsa/locale/ar/fusiondirectory.po
+++ b/dsa/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/ca/fusiondirectory.po b/dsa/locale/ca/fusiondirectory.po
index b683bd2de2..4151c9dfea 100644
--- a/dsa/locale/ca/fusiondirectory.po
+++ b/dsa/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Canvia la contrasenya"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Contrasenya"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/cs_CZ/fusiondirectory.po b/dsa/locale/cs_CZ/fusiondirectory.po
index 6425e7bb0d..372ca5d9f3 100644
--- a/dsa/locale/cs_CZ/fusiondirectory.po
+++ b/dsa/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr "Nastavení DSA"
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr "Nastavení zásuvného modulu dsa pro FusionDirectory"
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr "Relativní rozlišený název DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr "Větev, ve které bude uložen servisní účet adresáře (dsa)"
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr "Správa DSA"
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Změnit heslo"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Heslo"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr "Správa DSA"
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr "Nastavení DSA"
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr "Nastavení zásuvného modulu dsa pro FusionDirectory"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr "Relativní rozlišený název DSA"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr "Větev, ve které bude uložen servisní účet adresáře (dsa)"
diff --git a/dsa/locale/de/fusiondirectory.po b/dsa/locale/de/fusiondirectory.po
index 81b04c9637..5c3ea6958c 100644
--- a/dsa/locale/de/fusiondirectory.po
+++ b/dsa/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,31 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr "DSA-Konfiguration"
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr "FusionDirectory dsa Pluginkonfiguration"
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr "DSA RDN"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr "Zweig, in welchem das Verzeichnisdienstkonto (dsa) gespeichert wird"
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr "DSA-Verwaltung"
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -40,28 +65,3 @@ msgstr "Passwort ändern"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Passwort"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr "DSA-Verwaltung"
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr "DSA-Konfiguration"
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr "FusionDirectory dsa Pluginkonfiguration"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr "DSA RDN"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr "Zweig, in welchem das Verzeichnisdienstkonto (dsa) gespeichert wird"
diff --git a/dsa/locale/el_GR/fusiondirectory.po b/dsa/locale/el_GR/fusiondirectory.po
index 3bfe4014e7..2c68ecfc98 100644
--- a/dsa/locale/el_GR/fusiondirectory.po
+++ b/dsa/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,31 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr "Ρύθμιση DSA"
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory dsa"
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr "DSA RDN"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr "Κλάδος στον οποίο θα αποθηκεύεται το  Directory Service Account (dsa)"
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr "Διαχείριση DSA"
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -40,28 +65,3 @@ msgstr "Αλλαγή κωδικού πρόσβασης"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Κωδικός πρόσβασης"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr "Διαχείριση DSA"
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr "Ρύθμιση DSA"
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory dsa"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr "DSA RDN"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr "Κλάδος στον οποίο θα αποθηκεύεται το  Directory Service Account (dsa)"
diff --git a/dsa/locale/es/fusiondirectory.po b/dsa/locale/es/fusiondirectory.po
index 5adde8f635..142feebddd 100644
--- a/dsa/locale/es/fusiondirectory.po
+++ b/dsa/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Cambiar contraseña"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Contraseña"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/es_CO/fusiondirectory.po b/dsa/locale/es_CO/fusiondirectory.po
index 5abb5f4dc5..a412ca4709 100644
--- a/dsa/locale/es_CO/fusiondirectory.po
+++ b/dsa/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Contraseña"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/es_VE/fusiondirectory.po b/dsa/locale/es_VE/fusiondirectory.po
index f924b60c6e..132707634f 100644
--- a/dsa/locale/es_VE/fusiondirectory.po
+++ b/dsa/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Cambiar contraseña"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Contraseña"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/fa_IR/fusiondirectory.po b/dsa/locale/fa_IR/fusiondirectory.po
index 0e8f0c5547..1ac9f7e5d3 100644
--- a/dsa/locale/fa_IR/fusiondirectory.po
+++ b/dsa/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/fi_FI/fusiondirectory.po b/dsa/locale/fi_FI/fusiondirectory.po
index 8e3d765dd9..3c680f8532 100644
--- a/dsa/locale/fi_FI/fusiondirectory.po
+++ b/dsa/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Salasana"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/fr/fusiondirectory.po b/dsa/locale/fr/fusiondirectory.po
index c089d97c8c..ee15481c46 100644
--- a/dsa/locale/fr/fusiondirectory.po
+++ b/dsa/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,6 +18,31 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr "Configuration DSA"
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr "Configuration du plugin dsa"
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr "Branche DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr "Branche où seront stockés les objets Directory Service Account (dsa)"
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr "Gestion DSA"
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -40,28 +65,3 @@ msgstr "Modifier le mot de passe"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Mot de passe"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr "Gestion DSA"
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr "Configuration DSA"
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr "Configuration du plugin dsa"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr "Branche DSA"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr "Branche où seront stockés les objets Directory Service Account (dsa)"
diff --git a/dsa/locale/hu_HU/fusiondirectory.po b/dsa/locale/hu_HU/fusiondirectory.po
index 8f55afaa5a..dffd1ef234 100644
--- a/dsa/locale/hu_HU/fusiondirectory.po
+++ b/dsa/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/id/fusiondirectory.po b/dsa/locale/id/fusiondirectory.po
index b66309abdc..bab6f6731f 100644
--- a/dsa/locale/id/fusiondirectory.po
+++ b/dsa/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/it_IT/fusiondirectory.po b/dsa/locale/it_IT/fusiondirectory.po
index 5b4ea5d605..cb5206c93a 100644
--- a/dsa/locale/it_IT/fusiondirectory.po
+++ b/dsa/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:22+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,6 +19,31 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr "Configurazione DSA"
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr "Configurazione del plugin DSA di FusionDirectory"
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr "RDN DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr "Ramo nel quale il Directory Service Account (dsa) sarà immagazzinato"
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr "Gestione DSA"
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -41,28 +66,3 @@ msgstr "Cambia la password"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Password"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr "Gestione DSA"
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr "Configurazione DSA"
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr "Configurazione del plugin DSA di FusionDirectory"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr "RDN DSA"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr "Ramo nel quale il Directory Service Account (dsa) sarà immagazzinato"
diff --git a/dsa/locale/lv/fusiondirectory.po b/dsa/locale/lv/fusiondirectory.po
index 34305e4458..e5889a6517 100644
--- a/dsa/locale/lv/fusiondirectory.po
+++ b/dsa/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/nb/fusiondirectory.po b/dsa/locale/nb/fusiondirectory.po
index b5d1243293..815bcb6f3d 100644
--- a/dsa/locale/nb/fusiondirectory.po
+++ b/dsa/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/nl/fusiondirectory.po b/dsa/locale/nl/fusiondirectory.po
index 265df2c88c..d431a9028d 100644
--- a/dsa/locale/nl/fusiondirectory.po
+++ b/dsa/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr "DSA configuratie"
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr "FusionDirectory dsa plugin configuratie"
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA1"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr "DSA RDN"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr "DSA beheer"
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Verander wachtwoord"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Wachtwoord"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA1"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr "DSA beheer"
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr "DSA configuratie"
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr "FusionDirectory dsa plugin configuratie"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr "DSA RDN"
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/pl/fusiondirectory.po b/dsa/locale/pl/fusiondirectory.po
index 199874854f..072ac1c5c9 100644
--- a/dsa/locale/pl/fusiondirectory.po
+++ b/dsa/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Zmień hasło"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Hasło"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/pt/fusiondirectory.po b/dsa/locale/pt/fusiondirectory.po
index 9b790c3556..67942ad397 100644
--- a/dsa/locale/pt/fusiondirectory.po
+++ b/dsa/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Alterar senha"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Senha"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/pt_BR/fusiondirectory.po b/dsa/locale/pt_BR/fusiondirectory.po
index 23804d35c0..0623263713 100644
--- a/dsa/locale/pt_BR/fusiondirectory.po
+++ b/dsa/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Alterar senha"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Senha"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/ru/fusiondirectory.po b/dsa/locale/ru/fusiondirectory.po
index 70f7e76a53..fa01996a10 100644
--- a/dsa/locale/ru/fusiondirectory.po
+++ b/dsa/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Сменить пароль"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Пароль"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/ru@petr1708/fusiondirectory.po b/dsa/locale/ru@petr1708/fusiondirectory.po
index 6cd5a6dbce..79797b61f4 100644
--- a/dsa/locale/ru@petr1708/fusiondirectory.po
+++ b/dsa/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/sv/fusiondirectory.po b/dsa/locale/sv/fusiondirectory.po
index ae633666b0..c2cb23bbc0 100644
--- a/dsa/locale/sv/fusiondirectory.po
+++ b/dsa/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr "DSA"
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Byt lösenord"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Lösenord"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr "DSA"
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/ug/fusiondirectory.po b/dsa/locale/ug/fusiondirectory.po
index 26cf7e84c6..966734490a 100644
--- a/dsa/locale/ug/fusiondirectory.po
+++ b/dsa/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:40+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/vi_VN/fusiondirectory.po b/dsa/locale/vi_VN/fusiondirectory.po
index 6534f094ef..63077868a6 100644
--- a/dsa/locale/vi_VN/fusiondirectory.po
+++ b/dsa/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "Thay đổi mật mã "
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "Mật khẩu"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/dsa/locale/zh/fusiondirectory.po b/dsa/locale/zh/fusiondirectory.po
index 7a6ea3aaaa..1fbe007976 100644
--- a/dsa/locale/zh/fusiondirectory.po
+++ b/dsa/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:42 admin/dsa/class_dsaManagement.inc:34
+#: admin/dsa/class_dsaManagement.inc:39
+msgid "DSA"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
@@ -39,28 +64,3 @@ msgstr "修改口令"
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
 msgstr "口令"
-
-#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
-#: config/dsa/class_dsaConfig.inc:42
-msgid "DSA"
-msgstr ""
-
-#: admin/dsa/class_dsaManagement.inc:35
-msgid "DSA management"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:28
-msgid "DSA configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:29
-msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "DSA RDN"
-msgstr ""
-
-#: config/dsa/class_dsaConfig.inc:45
-msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr ""
diff --git a/ejbca/locale/ar/fusiondirectory.po b/ejbca/locale/ar/fusiondirectory.po
index 751dad9051..62e9d75549 100644
--- a/ejbca/locale/ar/fusiondirectory.po
+++ b/ejbca/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "الإسم"
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/ca/fusiondirectory.po b/ejbca/locale/ca/fusiondirectory.po
index 6061c0e498..a66d1fe4c3 100644
--- a/ejbca/locale/ca/fusiondirectory.po
+++ b/ejbca/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Nom"
 #: 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/cs_CZ/fusiondirectory.po b/ejbca/locale/cs_CZ/fusiondirectory.po
index 9ed466eb2b..c2de9da742 100644
--- a/ejbca/locale/cs_CZ/fusiondirectory.po
+++ b/ejbca/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr "Nastavení zásuvného modulu EJBCA"
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr "Nastavení zásuvného modulu ejbca pro FusionDirectory"
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr "Zásuvný modul EJBCA"
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr "Relativní rozlišený název pro EJBCA"
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr "Větev, ve které jsou ukládány ejbca certifikáty"
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -65,23 +85,3 @@ msgstr "Běžný název (CN)"
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr "Obsah certifikátu"
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr "Nastavení zásuvného modulu EJBCA"
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr "Nastavení zásuvného modulu ejbca pro FusionDirectory"
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr "Zásuvný modul EJBCA"
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr "Relativní rozlišený název pro EJBCA"
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr "Větev, ve které jsou ukládány ejbca certifikáty"
diff --git a/ejbca/locale/de/fusiondirectory.po b/ejbca/locale/de/fusiondirectory.po
index e53ffd2eb3..e8081bbef9 100644
--- a/ejbca/locale/de/fusiondirectory.po
+++ b/ejbca/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr "EJBCA-Pluginkonfiguration"
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr "EJBCA-Plugin"
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr "EJBCA RDN"
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr "Zweig, in welchem EJBCA-Zertifikate gespeichert werden"
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -65,23 +85,3 @@ msgstr "Gewöhnlicher Name"
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr "Zertifikatsinhalt"
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr "EJBCA-Pluginkonfiguration"
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr "EJBCA-Plugin"
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr "EJBCA RDN"
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr "Zweig, in welchem EJBCA-Zertifikate gespeichert werden"
diff --git a/ejbca/locale/el_GR/fusiondirectory.po b/ejbca/locale/el_GR/fusiondirectory.po
index 11d3a9e42b..199b94b1d5 100644
--- a/ejbca/locale/el_GR/fusiondirectory.po
+++ b/ejbca/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr "Ρύθμιση προσθέτου EJBCA "
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr "Ρύθμιση προσθέτου ejbca FusionDirectory "
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr "Πρόσθετο EJBCA"
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr "EJBCA RDN"
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr "Κλάδος όπου τα πιστοποιητικά ejbca αποθηκεύονται"
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -65,23 +85,3 @@ msgstr "Κοινό όνομα"
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr "Περιεχόμενο πιστοποιητικού"
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr "Ρύθμιση προσθέτου EJBCA "
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr "Ρύθμιση προσθέτου ejbca FusionDirectory "
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr "Πρόσθετο EJBCA"
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr "EJBCA RDN"
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr "Κλάδος όπου τα πιστοποιητικά ejbca αποθηκεύονται"
diff --git a/ejbca/locale/es/fusiondirectory.po b/ejbca/locale/es/fusiondirectory.po
index 644e006986..3c35267c0b 100644
--- a/ejbca/locale/es/fusiondirectory.po
+++ b/ejbca/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Nombre común"
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/es_CO/fusiondirectory.po b/ejbca/locale/es_CO/fusiondirectory.po
index 817d1334c6..5c19cbc409 100644
--- a/ejbca/locale/es_CO/fusiondirectory.po
+++ b/ejbca/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr ""
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/es_VE/fusiondirectory.po b/ejbca/locale/es_VE/fusiondirectory.po
index f8d4ed4736..66a9b30f10 100644
--- a/ejbca/locale/es_VE/fusiondirectory.po
+++ b/ejbca/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Nombre común"
 #: 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/fa_IR/fusiondirectory.po b/ejbca/locale/fa_IR/fusiondirectory.po
index 8cbe730e23..01662d0257 100644
--- a/ejbca/locale/fa_IR/fusiondirectory.po
+++ b/ejbca/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr ""
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/fi_FI/fusiondirectory.po b/ejbca/locale/fi_FI/fusiondirectory.po
index 90cc682fc4..af50f88059 100644
--- a/ejbca/locale/fi_FI/fusiondirectory.po
+++ b/ejbca/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr ""
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr "Sertifikaatin sisältö"
-
-#: 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/fr/fusiondirectory.po b/ejbca/locale/fr/fusiondirectory.po
index 653557b15f..5a951da26e 100644
--- a/ejbca/locale/fr/fusiondirectory.po
+++ b/ejbca/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr "Configuration du plugin EJBCA"
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr "Configuration du plugin ejbca pour FusionDirectory"
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr "Plugin EJBCA"
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr "Branche EJBCA"
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr "Branche dans laquelle sont stockés les certificats EJBCA"
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -65,23 +85,3 @@ msgstr "Nom commun"
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr "Contenu du certificat"
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr "Configuration du plugin EJBCA"
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr "Configuration du plugin ejbca pour FusionDirectory"
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr "Plugin EJBCA"
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr "Branche EJBCA"
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr "Branche dans laquelle sont stockés les certificats EJBCA"
diff --git a/ejbca/locale/hu_HU/fusiondirectory.po b/ejbca/locale/hu_HU/fusiondirectory.po
index 0c92d5c457..5b7aa307eb 100644
--- a/ejbca/locale/hu_HU/fusiondirectory.po
+++ b/ejbca/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr ""
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/id/fusiondirectory.po b/ejbca/locale/id/fusiondirectory.po
index 6e122f7c3e..2267c714e1 100644
--- a/ejbca/locale/id/fusiondirectory.po
+++ b/ejbca/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr ""
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/it_IT/fusiondirectory.po b/ejbca/locale/it_IT/fusiondirectory.po
index cec899421d..c9db62a2dc 100644
--- a/ejbca/locale/it_IT/fusiondirectory.po
+++ b/ejbca/locale/it_IT/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:22+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr "Configurazione plugin EJBCA"
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr "Configurazione del plugin EJBCA di FusionDirectory"
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr "Plugin EJBCA"
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr "RDN EJBCA"
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr "Ramo nel quale saranno immagazzinati i certificati EJBCA"
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Nome comune"
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr "Contenuto del certificato"
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr "Configurazione plugin EJBCA"
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr "Configurazione del plugin EJBCA di FusionDirectory"
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr "Plugin EJBCA"
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr "RDN EJBCA"
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr "Ramo nel quale saranno immagazzinati i certificati EJBCA"
diff --git a/ejbca/locale/lv/fusiondirectory.po b/ejbca/locale/lv/fusiondirectory.po
index b20782acdf..d8e095b13d 100644
--- a/ejbca/locale/lv/fusiondirectory.po
+++ b/ejbca/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr ""
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/nb/fusiondirectory.po b/ejbca/locale/nb/fusiondirectory.po
index fcb221b90e..b153152f8c 100644
--- a/ejbca/locale/nb/fusiondirectory.po
+++ b/ejbca/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Navn"
 #: 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/nl/fusiondirectory.po b/ejbca/locale/nl/fusiondirectory.po
index 15af4f6675..94cbe41ed7 100644
--- a/ejbca/locale/nl/fusiondirectory.po
+++ b/ejbca/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Naam"
 #: 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/pl/fusiondirectory.po b/ejbca/locale/pl/fusiondirectory.po
index e19b53f953..715025b5e8 100644
--- a/ejbca/locale/pl/fusiondirectory.po
+++ b/ejbca/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Nazwa potoczna"
 #: 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/pt/fusiondirectory.po b/ejbca/locale/pt/fusiondirectory.po
index f3583332a2..b3609a8eca 100644
--- a/ejbca/locale/pt/fusiondirectory.po
+++ b/ejbca/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Nome"
 #: 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/pt_BR/fusiondirectory.po b/ejbca/locale/pt_BR/fusiondirectory.po
index 7473518ce3..92bae99241 100644
--- a/ejbca/locale/pt_BR/fusiondirectory.po
+++ b/ejbca/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Nome"
 #: 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/ru/fusiondirectory.po b/ejbca/locale/ru/fusiondirectory.po
index e65bca6e4e..b85384a7f4 100644
--- a/ejbca/locale/ru/fusiondirectory.po
+++ b/ejbca/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Фамилия"
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr "Содержимое сетрификата"
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/ru@petr1708/fusiondirectory.po b/ejbca/locale/ru@petr1708/fusiondirectory.po
index be10e80fd7..0ceecae25e 100644
--- a/ejbca/locale/ru@petr1708/fusiondirectory.po
+++ b/ejbca/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr ""
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/sv/fusiondirectory.po b/ejbca/locale/sv/fusiondirectory.po
index 6fcabb1d92..06dc8170d7 100644
--- a/ejbca/locale/sv/fusiondirectory.po
+++ b/ejbca/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Namn"
 #: 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/ug/fusiondirectory.po b/ejbca/locale/ug/fusiondirectory.po
index 6bf406b6dc..f1fe1ca474 100644
--- a/ejbca/locale/ug/fusiondirectory.po
+++ b/ejbca/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:41+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr ""
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/ejbca/locale/vi_VN/fusiondirectory.po b/ejbca/locale/vi_VN/fusiondirectory.po
index d241f902c2..e282d9ddf9 100644
--- a/ejbca/locale/vi_VN/fusiondirectory.po
+++ b/ejbca/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "Tên"
 #: 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/zh/fusiondirectory.po b/ejbca/locale/zh/fusiondirectory.po
index 41c42857b3..9c6e809db0 100644
--- a/ejbca/locale/zh/fusiondirectory.po
+++ b/ejbca/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
+
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
@@ -64,23 +84,3 @@ msgstr "常用名"
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
 msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:28
-msgid "EJBCA plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:29
-msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:42
-msgid "EJBCA plugin"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "EJBCA RDN"
-msgstr ""
-
-#: config/ejbca/class_ejbcaConfig.inc:45
-msgid "Branch in which ejbca certificates are stored"
-msgstr ""
diff --git a/fai/locale/ar/fusiondirectory.po b/fai/locale/ar/fusiondirectory.po
index f01a369ec7..1f7bb776e7 100644
--- a/fai/locale/ar/fusiondirectory.po
+++ b/fai/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "الخواص"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "الوصف"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "خطأ"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "الإسم"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "خطأ"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "الخواص"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "الوصف"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "تحذير"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
+msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: 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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "الإسم"
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "تحذير"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,230 +934,40 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 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/ca/fusiondirectory.po b/fai/locale/ca/fusiondirectory.po
index f7c54908b5..8d641a4759 100644
--- a/fai/locale/ca/fusiondirectory.po
+++ b/fai/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Error d'LDAP"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Error d'LDAP"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Error"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "Nom"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Error"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Avís"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
+msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: 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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "Nom"
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Avís"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,230 +934,40 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 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/cs_CZ/fusiondirectory.po b/fai/locale/cs_CZ/fusiondirectory.po
index 191a687720..23ff0ff5b0 100644
--- a/fai/locale/cs_CZ/fusiondirectory.po
+++ b/fai/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,23 +17,380 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr "Nastavení FAI"
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr "Nastavení zásuvného modulu fai pro FusionDirectory"
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
-msgstr "Spravovat FAI balíčky programového vybavení a skripty pro nasazování"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr "Základ relativního rozlišeného názvu FAI"
+
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
+msgstr "Větev, ve které budou ukládány fai větve"
+
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
+msgstr "Relativní rozlišený název FAI %s"
+
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
+msgstr "Relativní větev ve které bude uložena fai %s"
+
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
+msgstr "s"
+
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
+msgstr "Plně samočinná instalace (FAI)"
+
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr "nastavení FAI"
+
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
+msgstr "Profil FAI a vydání, které má být použito na tento počítač"
+
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Vydání"
+
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr "FAI vydání systému Debian, které má být nainstalováno na tento počítač"
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
+msgstr "Sada nastavení"
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr "Profil FAI, který má být použit na tento počítač"
+
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Repozitář"
+
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
+msgstr "FAI repozitář systému Debian, který má být použit pro instalaci"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr "URL adresa"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr "URL adresa repozitáře"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr "Nadřazený server"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr "Server nadřazeného repozitáře"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
+msgstr "Vydání použité v tomto repozitáři"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
+msgstr "oddíly"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
+msgstr "Sekce, dostupné v tomto repozitáři"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
+msgstr "Režim zrcadla"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
+msgstr "Je toto zrcadlo instalačním repozitářem? Je zdejší vydání upravené?"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr "Místní zrcadlo"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
+msgstr "Je toto zrcadlo místní či síťové?"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
+msgstr "Architektury"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
+msgstr "Procesorové architektury, dostupné v tomto repozitáři"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
+msgstr "Distribuce"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
+msgstr "Pro kterou distribuci je tento repozitář určen"
+
+#: 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 "Repozitář balíčků"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
+msgstr "Informace o repozitáři balíčků"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
+msgstr "Repozitáře"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
+msgstr "Repozitáře, které se nacházejí na tomto serveru"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Chyba LDAP"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
+msgstr "Argonaut FAI dohledování"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr "Nastavení dohledování v Argonaut FAI"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
+msgstr "Port"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+msgstr "Port na kterém má argonaut-fai-monitor očekávat spojení. Výchozí je 4711."
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
+msgstr "Překročení časového limitu"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr "Časový limit pro chybné klienty. 0 (nula) znamená neomezovat."
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
+msgstr "Certifikát cert. autority"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+msgstr "Umístění certifikátu cert. autority na dohledovacím serveru Argonaut FAI"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
+msgstr "Složka pro záznamy protokolů"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr "Složka ve které argonaut-fai-monitor ukládá své záznamy událostí"
+
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr "Seřadit sestupně"
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr "Seřadit vzestupně"
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Soubor"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Datum"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr "Protokoly k dispozici"
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr "Vybraný protokol"
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr "Obsah zvoleného protokolu"
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr "Protokoly FAI"
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr "Prohlížeč protokolu FAI"
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Chyba"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr "Zvolený soubor"
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr "Zvolený soubor: %s"
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr "Přidat RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr "Přidat LVM"
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Tabulka rozdělení jednotky datového úložiště"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "tabulka dělení úložiště pro FAI"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Název třídy"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr "Název třídy tabulky oddílů"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Popis"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr "Stručný popis třídy"
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Jednotky datového úložiště"
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+msgstr "Oddíly v této třídě"
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
-msgstr "Nejsou zde žádné FAI větve"
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "File path"
+msgstr "Umístění souboru"
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
-msgstr "Pro vytvoření těchto přidejte alespoň jeden repozitář."
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "Complete absolute template file path and name"
+msgstr "Úplný popis umístění souboru a název"
+
+#: admin/fai/class_faiTemplateEntry.inc:146
+msgid "Short description of the file"
+msgstr "Stručný popis souboru"
+
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
+msgstr "Atributy šablony"
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Template file content"
+msgstr "Obsah souboru se šablonou"
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Content of the template file"
+msgstr "Obsah souboru se šablonou"
+
+#: admin/fai/class_faiTemplateEntry.inc:163
+msgid "Owner and group of the file"
+msgstr "Vlastník a skupina souboru"
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "Owner"
+msgstr "Vlastník"
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "File owner"
+msgstr "Vlastník souboru"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "Group"
+msgstr "Skupina"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "File group"
+msgstr "Skupina souboru"
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access"
+msgstr "Přístup"
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access rights"
+msgstr "Přístupová práva"
 
 #: admin/fai/class_faiPackage.inc:166
 msgid "Mark for installation"
@@ -47,20 +404,10 @@ msgstr "Označit k odstranění"
 msgid "Edit configuration"
 msgstr "Upravit nastavení"
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Chyba LDAP"
-
 #: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
 msgid "Infrastructure service"
 msgstr "Služba Infrastruktura"
 
@@ -80,62 +427,15 @@ msgstr "Seznam balíčků pro FAI instalaci"
 msgid "FAI Package"
 msgstr "FAI balíček"
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Název třídy"
-
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr "Název třídy proměnných"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Popis"
-
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr "Stručný popis třídy"
-
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Repozitář"
-
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Vydání"
-
 #: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr "Týkající se vydání distribuce Debian"
 
-#: admin/fai/class_faiPackage.inc:416
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr "oddíly"
-
 #: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr "Sekce, kterých se týká"
@@ -156,36 +456,6 @@ msgstr "balíčky"
 msgid "Packages in this class"
 msgstr "Balíčky v této třídě"
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr "Přidat RAID"
-
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr "Přidat LVM"
-
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Tabulka rozdělení jednotky datového úložiště"
-
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "tabulka dělení úložiště pro FAI"
-
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
-msgstr "Název třídy tabulky oddílů"
-
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Jednotky datového úložiště"
-
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
-msgstr "Oddíly v této třídě"
-
 #: admin/fai/class_faiDiskEntry.inc:103
 msgid "encrypted"
 msgstr "šifrované"
@@ -198,11 +468,6 @@ msgstr "zaveditelné"
 msgid "preserve"
 msgstr "zachovat"
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Chyba"
-
 #: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
@@ -222,11 +487,11 @@ msgstr "Položka tabulky rozdělení úložiště pro FAI"
 msgid "Device"
 msgstr "Zařízení"
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Název"
@@ -283,152 +548,45 @@ msgid ""
 "partitions"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-msgid "File path"
-msgstr "Umístění souboru"
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-msgid "Complete absolute template file path and name"
-msgstr "Úplný popis umístění souboru a název"
-
-#: admin/fai/class_faiTemplateEntry.inc:146
-msgid "Short description of the file"
-msgstr "Stručný popis souboru"
-
-#: admin/fai/class_faiTemplateEntry.inc:155
-msgid "Template attributes"
-msgstr "Atributy šablony"
-
-#: admin/fai/class_faiTemplateEntry.inc:159
-msgid "Template file content"
-msgstr "Obsah souboru se šablonou"
-
-#: admin/fai/class_faiTemplateEntry.inc:159
-msgid "Content of the template file"
-msgstr "Obsah souboru se šablonou"
-
-#: admin/fai/class_faiTemplateEntry.inc:163
-msgid "Owner and group of the file"
-msgstr "Vlastník a skupina souboru"
-
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "Owner"
-msgstr "Vlastník"
-
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "File owner"
-msgstr "Vlastník souboru"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "Group"
-msgstr "Skupina"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "File group"
-msgstr "Skupina souboru"
-
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access"
-msgstr "Přístup"
-
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access rights"
-msgstr "Přístupová práva"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Vyberte požadované položky"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr "Verze"
-
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Profil"
-
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
-msgstr "profil FAI"
-
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
-msgstr "Sada nastavení FAI"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "Třídy FAI"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
-msgstr "FAI třídy, které jsou částmi tohoto profilu"
-
-#: 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 "Varování"
-
-#: 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_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "Skript"
-
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
-msgstr "Skript FAI"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr "háček"
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Skripty"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr "háček FAI"
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "háčky"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr "Proměnné v této třídě"
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr "Název proměnné"
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr "Stručný popis proměnné"
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Pořadí přednosti"
-
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
-msgstr "Pořadí přednosti tohoto skriptu (nižší číslo znamená dřívější spuštění)"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Úkol"
 
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
-msgstr "Skript samotný"
+msgid "Script"
+msgstr "Skript"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr "Skript tohoto háčku"
 
 #: admin/fai/class_faiTemplate.inc:136
 #, php-format
@@ -455,6 +613,33 @@ msgstr "Soubory se šablonami"
 msgid "Template files in this class"
 msgstr "Soubory šablon v této třídě"
 
+#: 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 "Varování"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -604,372 +789,178 @@ msgstr "prostor pro odložení paměťových stránek (swap)"
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext3"
-msgstr "ext3"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr "ext4"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr "reiserfs"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr "xfs"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr "btrfs"
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr "Přípojný bod"
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr "Možnosti"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr "Vytvořit předvolby"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr "Předvolby vytváření souborového systému"
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr "Možnosti vyladění"
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Filesystem tune options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Předvolby připojování (mount)"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
-msgid "RAID 0"
-msgstr "RAID 0"
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr "RAID 1"
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr "RAID 5"
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr "RAID 6"
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr "Pole RAID nemůže být tvořeno méně než dvěma oddíly!"
-
-#: admin/fai/class_faiPartition.inc:480
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "Pole RAID 0 může tvořeno jedině a pouze dvěma oddíly!"
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr "háček"
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr "háček FAI"
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "háčky"
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Úkol"
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
-msgstr "Skript tohoto háčku"
-
-#: admin/fai/class_faiVariable.inc:28
-msgid "Variable"
-msgstr "Proměnná"
-
-#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
-msgid "FAI variable"
-msgstr "Proměnná pro FAI"
-
-#: admin/fai/class_faiVariable.inc:61
-msgid "Variables"
-msgstr "Proměnné"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
-msgstr "Obsah"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
-msgstr "Obsah proměnné"
-
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr "Seřadit sestupně"
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr "Seřadit vzestupně"
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Soubor"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Datum"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr "Protokoly k dispozici"
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr "Vybraný protokol"
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr "Obsah zvoleného protokolu"
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr "Protokoly FAI"
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr "Prohlížeč protokolu FAI"
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr "Zvolený soubor"
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr "Zvolený soubor: %s"
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr "nastavení FAI"
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr "Profil FAI a vydání, které má být použito na tento počítač"
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr "FAI vydání systému Debian, které má být nainstalováno na tento počítač"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr "Sada nastavení"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr "Profil FAI, který má být použit na tento počítač"
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr "FAI repozitář systému Debian, který má být použit pro instalaci"
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
-msgstr "Plně samočinná instalace (FAI)"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL adresa"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext3"
+msgstr "ext3"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
-msgstr "URL adresa repozitáře"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext4"
+msgstr "ext4"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
-msgstr "Nadřazený server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
+msgstr "reiserfs"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
-msgstr "Server nadřazeného repozitáře"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
+msgstr "xfs"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
-msgstr "Vydání použité v tomto repozitáři"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
+msgstr "btrfs"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
-msgstr "Sekce, dostupné v tomto repozitáři"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
+msgstr "LVM/RAID"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
-msgstr "Režim zrcadla"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
+msgstr "Šifrované"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
-msgstr "Je toto zrcadlo instalačním repozitářem? Je zdejší vydání upravené?"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
+msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
-msgstr "Místní zrcadlo"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
+msgstr "Přípojný bod"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
-msgstr "Je toto zrcadlo místní či síťové?"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
+msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
-msgstr "Architektury"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
+msgstr "Možnosti"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
-msgstr "Procesorové architektury, dostupné v tomto repozitáři"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
+msgstr "Vytvořit předvolby"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
-msgstr "Distribuce"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
+msgstr "Předvolby vytváření souborového systému"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr "Pro kterou distribuci je tento repozitář určen"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
+msgstr "Možnosti vyladění"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
+msgstr "Předvolby připojování (mount)"
+
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
-msgstr "Repozitář balíčků"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
+msgstr "RAID 0"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr "Informace o repozitáři balíčků"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
+msgstr "RAID 1"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr "Repozitáře"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
+msgstr "RAID 5"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
-msgstr "Repozitáře, které se nacházejí na tomto serveru"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
+msgstr "RAID 6"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
-msgstr "Argonaut FAI dohledování"
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
+msgstr "Pole RAID nemůže být tvořeno méně než dvěma oddíly!"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
-msgstr "Nastavení dohledování v Argonaut FAI"
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
+msgstr "Pole RAID 0 může tvořeno jedině a pouze dvěma oddíly!"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr "Port"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Profil"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
-msgstr "Port na kterém má argonaut-fai-monitor očekávat spojení. Výchozí je 4711."
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr "profil FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
-msgstr "Překročení časového limitu"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr "Sada nastavení FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
-msgstr "Časový limit pro chybné klienty. 0 (nula) znamená neomezovat."
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "Třídy FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
-msgstr "Certifikát cert. autority"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr "FAI třídy, které jsou částmi tohoto profilu"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr "Umístění certifikátu cert. autority na dohledovacím serveru Argonaut FAI"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr "Spravovat FAI balíčky programového vybavení a skripty pro nasazování"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
-msgstr "Složka pro záznamy protokolů"
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr "Nejsou zde žádné FAI větve"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
-msgstr "Složka ve které argonaut-fai-monitor ukládá své záznamy událostí"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
+msgstr "Pro vytvoření těchto přidejte alespoň jeden repozitář."
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
-msgstr "Nastavení FAI"
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
+msgstr "Proměnná"
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
-msgstr "Nastavení zásuvného modulu fai pro FusionDirectory"
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
+msgstr "Proměnná pro FAI"
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
-msgstr "Základ relativního rozlišeného názvu FAI"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
+msgstr "Proměnné"
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
-msgstr "Větev, ve které budou ukládány fai větve"
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
+msgstr "Obsah"
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
-msgstr "Relativní rozlišený název FAI %s"
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
+msgstr "Obsah proměnné"
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
-msgstr "Relativní větev ve které bude uložena fai %s"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "Skript FAI"
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
-msgstr "s"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Skripty"
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Aktualizovat"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Pořadí přednosti"
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Potvrdit"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
+msgstr "Pořadí přednosti tohoto skriptu (nižší číslo znamená dřívější spuštění)"
+
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr "Skript samotný"
+
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Vyberte požadované položky"
+
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr "Verze"
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
 msgid "Filter"
@@ -978,3 +969,11 @@ msgstr "Filtr"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Nebude zde zobrazeno více než 200 položek."
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
+msgid "Update"
+msgstr "Aktualizovat"
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
+msgid "Submit"
+msgstr "Potvrdit"
diff --git a/fai/locale/de/fusiondirectory.po b/fai/locale/de/fusiondirectory.po
index 7a5bdcc0e5..e887a0c551 100644
--- a/fai/locale/de/fusiondirectory.po
+++ b/fai/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,23 +17,380 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr "FAI Konfiguration"
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr "FusionDirectory fai Plugin-Konfiguration"
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
-msgstr "Verwaltung von FAI Softwarepaketen und Deployment-Recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr "Fai Basis RDN"
+
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
+msgstr "Zweig in welchem FAI-Zweige gespeichert werden"
+
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
+msgstr "Fai %s RDN"
+
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
+msgstr "Relativer Zweig in welchem fai %s gespeichert werden"
+
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
+msgstr "s"
+
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
+msgstr "Full Automated Installation"
+
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr "FAI-Einstellungen"
+
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
+msgstr "FAI Profil und Veröffentlichung, die auf diesen Rechner angewendet werden soll"
+
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Release"
+
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr "FAI Debian-Veröffentlichung, die auf diesen Rechner installiert werden soll"
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
+msgstr "Profil"
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr "FAI-Profil welches auf diesem Rechner angewendet werden soll"
+
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Repository"
+
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
+msgstr "FAI Debian-Repository, welches für die Installation verwendet werden soll"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr "URL"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr "Repositoriums-URL"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr "Quell-Server"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr "Parent Repository Server"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
+msgstr "Sektionen"
+
+#: 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 "Mirror-Modus"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
+msgstr "Ist dieser Mirror ein Installationsrepository? Ist sein Release ein eigenes erstelltes?"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr "Lokaler Mirror"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
+msgstr "Ist dieser Mirror ein lokaler oder ein Netzwerk-Mirror?"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
+msgstr "Architekturen"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
+msgstr "Verfügbare Prozessorarchitekturen in diesem Repository"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
+msgstr "Verteilung"
+
+#: 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 "Paketrepositorium"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
+msgstr "Paketrepositoriumsinformation"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
+msgstr "Repositories"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
+msgstr "Repositories, die dieser Server bereitstellt"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "LDAP-Fehler"
+
+#: 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 "Port"
+
+#: 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 "Zeitüberschreitung"
+
+#: 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 "CA-Zertifikat"
+
+#: 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 "Log Verzeichnis"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr "Absteigend sortieren"
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr "Aufsteigend sortieren"
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Datei"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Datum"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr "Verfügbare Protokolle"
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr "Ausgewähltes Protokoll"
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr "Inhalt des ausgewählten Protokolls"
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr "FAI-Protokolle"
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr "FAI-Protokollbetrachter"
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Fehler"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr "Ausgewählte Datei"
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr "Ausgewählte Datei: %s"
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr "RAID hinzufügen"
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr "LVM hinzufügen"
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Partitionstabelle"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "FAI-Partitionstabelle"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Klassen-Name"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr "Partitionstabellen-Klassenname"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Beschreibung"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr "Kurze Beschreibung von der Klasse"
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
-msgstr "Es gibt keine FAI-Zweige"
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Festplatten"
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
-msgstr ""
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+msgstr "Partitionen in dieser Klasse"
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "File path"
+msgstr "Dateipfad"
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "Complete absolute template file path and name"
+msgstr "Vollständiger absoluter Vorlagendateipfad und -name"
+
+#: admin/fai/class_faiTemplateEntry.inc:146
+msgid "Short description of the file"
+msgstr "Kurze Beschreibung von der Datei"
+
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
+msgstr "Vorlagen-Attribute"
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Template file content"
+msgstr "Vorlagendateiinhalt"
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Content of the template file"
+msgstr "Inhalt der Vorlagendatei"
+
+#: admin/fai/class_faiTemplateEntry.inc:163
+msgid "Owner and group of the file"
+msgstr "Eigentümer und Gruppe von der Datei"
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "Owner"
+msgstr "Besitzer"
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "File owner"
+msgstr "Datei-Besitzer"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "Group"
+msgstr "Gruppe"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "File group"
+msgstr "Dateigruppe"
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access"
+msgstr "Zugriff"
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access rights"
+msgstr "Zugriffsrechte"
 
 #: admin/fai/class_faiPackage.inc:166
 msgid "Mark for installation"
@@ -47,20 +404,10 @@ msgstr "Zum entfernen vormerken"
 msgid "Edit configuration"
 msgstr "Konfiguration bearbeiten"
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "LDAP-Fehler"
-
 #: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
 msgid "Infrastructure service"
 msgstr "Infrastrukturdienst"
 
@@ -80,62 +427,15 @@ msgstr "FAI-Paketliste"
 msgid "FAI Package"
 msgstr "FAI Paket"
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Klassen-Name"
-
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr "Variablenklassenname"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Beschreibung"
-
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr "Kurze Beschreibung von der Klasse"
-
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Repository"
-
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Release"
-
 #: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr "Debian-Version betreffend"
 
-#: admin/fai/class_faiPackage.inc:416
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr "Sektionen"
-
 #: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
@@ -156,36 +456,6 @@ msgstr "Pakete"
 msgid "Packages in this class"
 msgstr "Pakete in dieser Klasse"
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr "RAID hinzufügen"
-
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr "LVM hinzufügen"
-
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Partitionstabelle"
-
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "FAI-Partitionstabelle"
-
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
-msgstr "Partitionstabellen-Klassenname"
-
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Festplatten"
-
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
-msgstr "Partitionen in dieser Klasse"
-
 #: admin/fai/class_faiDiskEntry.inc:103
 msgid "encrypted"
 msgstr "verschlüsselt"
@@ -198,11 +468,6 @@ msgstr "bootbar"
 msgid "preserve"
 msgstr "bewahren"
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Fehler"
-
 #: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
@@ -222,11 +487,11 @@ msgstr "FAI-Partitionstabellen-Eintrag"
 msgid "Device"
 msgstr "Gerät"
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Name"
@@ -283,152 +548,45 @@ msgid ""
 "partitions"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-msgid "File path"
-msgstr "Dateipfad"
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-msgid "Complete absolute template file path and name"
-msgstr "Vollständiger absoluter Vorlagendateipfad und -name"
-
-#: admin/fai/class_faiTemplateEntry.inc:146
-msgid "Short description of the file"
-msgstr "Kurze Beschreibung von der Datei"
-
-#: admin/fai/class_faiTemplateEntry.inc:155
-msgid "Template attributes"
-msgstr "Vorlagen-Attribute"
-
-#: admin/fai/class_faiTemplateEntry.inc:159
-msgid "Template file content"
-msgstr "Vorlagendateiinhalt"
-
-#: admin/fai/class_faiTemplateEntry.inc:159
-msgid "Content of the template file"
-msgstr "Inhalt der Vorlagendatei"
-
-#: admin/fai/class_faiTemplateEntry.inc:163
-msgid "Owner and group of the file"
-msgstr "Eigentümer und Gruppe von der Datei"
-
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "Owner"
-msgstr "Besitzer"
-
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "File owner"
-msgstr "Datei-Besitzer"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "Group"
-msgstr "Gruppe"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "File group"
-msgstr "Dateigruppe"
-
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access"
-msgstr "Zugriff"
-
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access rights"
-msgstr "Zugriffsrechte"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Bitte wählen Sie die gewünschten Einträge"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr "Version"
-
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Profil"
-
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
-msgstr "FAI-Profil"
-
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
-msgstr "FAI Profil"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "FAI-Klassen"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
-msgstr "FAI-Klassen, die Teil dieses Profils sind"
-
-#: 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 "Warnung"
-
-#: 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_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "Skript"
-
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
-msgstr "FAI-Skript"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr "Hook"
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Skripte"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr "FAI-Hook"
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Hooks"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr "Variablen in dieser Klasse"
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr "Der Name der Variable"
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr "Eine kurze Beschreibung von der Variable"
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Priorität"
-
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
-msgstr ""
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Vorgang"
 
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
-msgstr "Das Skript selbst"
+msgid "Script"
+msgstr "Skript"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
 #, php-format
@@ -455,6 +613,33 @@ msgstr "Vorlagendateien"
 msgid "Template files in this class"
 msgstr "Vorlagendateien in dieser Klasse"
 
+#: 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 "Warnung"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -604,372 +789,178 @@ msgstr "Auslagerungsspeicher"
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext3"
-msgstr "ext3"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr "ext4"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr "reiser fs"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr "xfs"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr "btrfs"
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr "Einhänge-Pfad"
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr "Optionen"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr "Optionen aktivieren"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr "Dateisystem Erstell-Optionen"
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr "Optimierungs-Optionen"
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr "RAID 0"
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr "RAID 1"
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr "RAID 5"
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr "RAID 6"
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr "RAID-Arrays müssen mindestens zwei Partitionen enthalten!"
-
-#: admin/fai/class_faiPartition.inc:480
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "RAID 0 Arrays können nur in Kombination von zwei Partitionen realisiert werden!"
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr "Hook"
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr "FAI-Hook"
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Hooks"
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Vorgang"
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:28
-msgid "Variable"
-msgstr "Variable"
-
-#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
-msgid "FAI variable"
-msgstr "FAI-Variable"
-
-#: admin/fai/class_faiVariable.inc:61
-msgid "Variables"
-msgstr "Variablen"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
-msgstr "Inhalt"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
-msgstr "Der Inhalt der Variable"
-
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr "Absteigend sortieren"
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr "Aufsteigend sortieren"
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Datei"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Datum"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr "Verfügbare Protokolle"
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr "Ausgewähltes Protokoll"
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr "Inhalt des ausgewählten Protokolls"
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr "FAI-Protokolle"
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr "FAI-Protokollbetrachter"
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr "Ausgewählte Datei"
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr "Ausgewählte Datei: %s"
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr "FAI-Einstellungen"
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr "FAI Profil und Veröffentlichung, die auf diesen Rechner angewendet werden soll"
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr "FAI Debian-Veröffentlichung, die auf diesen Rechner installiert werden soll"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr "Profil"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr "FAI-Profil welches auf diesem Rechner angewendet werden soll"
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr "FAI Debian-Repository, welches für die Installation verwendet werden soll"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext3"
+msgstr "ext3"
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
-msgstr "Full Automated Installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext4"
+msgstr "ext4"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
+msgstr "reiser fs"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
-msgstr "Repositoriums-URL"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
+msgstr "xfs"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
-msgstr "Quell-Server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
+msgstr "btrfs"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
-msgstr "Parent Repository Server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
+msgstr "LVM/RAID"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
-msgstr ""
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
+msgstr "Verschlüsselt"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
-msgstr "Mirror-Modus"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
-msgstr "Ist dieser Mirror ein Installationsrepository? Ist sein Release ein eigenes erstelltes?"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
+msgstr "Einhänge-Pfad"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
-msgstr "Lokaler Mirror"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
+msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
-msgstr "Ist dieser Mirror ein lokaler oder ein Netzwerk-Mirror?"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
+msgstr "Optionen"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
-msgstr "Architekturen"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
+msgstr "Optionen aktivieren"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
-msgstr "Verfügbare Prozessorarchitekturen in diesem Repository"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
+msgstr "Dateisystem Erstell-Optionen"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
-msgstr "Verteilung"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
+msgstr "Optimierungs-Optionen"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
-msgstr ""
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
+msgstr "Mount-Optionen"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
-msgstr "Paketrepositorium"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
+msgstr "RAID 0"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr "Paketrepositoriumsinformation"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
+msgstr "RAID 1"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr "Repositories"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
+msgstr "RAID 5"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
-msgstr "Repositories, die dieser Server bereitstellt"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
+msgstr "RAID 6"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
-msgstr ""
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
+msgstr "RAID-Arrays müssen mindestens zwei Partitionen enthalten!"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
-msgstr ""
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
+msgstr "RAID 0 Arrays können nur in Kombination von zwei Partitionen realisiert werden!"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr "Port"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Profil"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
-msgstr ""
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr "FAI-Profil"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
-msgstr "Zeitüberschreitung"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr "FAI Profil"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
-msgstr ""
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "FAI-Klassen"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
-msgstr "CA-Zertifikat"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr "FAI-Klassen, die Teil dieses Profils sind"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr ""
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr "Verwaltung von FAI Softwarepaketen und Deployment-Recipes"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
-msgstr "Log Verzeichnis"
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr "Es gibt keine FAI-Zweige"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
-msgstr "FAI Konfiguration"
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
+msgstr "Variable"
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
-msgstr "FusionDirectory fai Plugin-Konfiguration"
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
+msgstr "FAI-Variable"
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
-msgstr "Fai Basis RDN"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
+msgstr "Variablen"
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
-msgstr "Zweig in welchem FAI-Zweige gespeichert werden"
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
+msgstr "Inhalt"
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
-msgstr "Fai %s RDN"
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
+msgstr "Der Inhalt der Variable"
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
-msgstr "Relativer Zweig in welchem fai %s gespeichert werden"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "FAI-Skript"
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
-msgstr "s"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Skripte"
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Aktualisieren"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Priorität"
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Übertragen"
+#: 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 "Das Skript selbst"
+
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Bitte wählen Sie die gewünschten Einträge"
+
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr "Version"
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
 msgid "Filter"
@@ -978,3 +969,11 @@ msgstr "Filter"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Es werden maximal 200 Einträge angezeigt."
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
+msgid "Submit"
+msgstr "Übertragen"
diff --git a/fai/locale/el_GR/fusiondirectory.po b/fai/locale/el_GR/fusiondirectory.po
index 8831403124..1c56026852 100644
--- a/fai/locale/el_GR/fusiondirectory.po
+++ b/fai/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -19,23 +19,380 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr "Ρύθμιση FAI "
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory fai"
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
-msgstr "Διαχείριση πακέτων λογισμικού FAI και οδηγιών ανάπτυξης"
+#: 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 "Κλάδος στον οποίο τοι κλάδοι fai θα αποθηκεύονται"
+
+#: 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 "Σχετικός κλάδος στον οποίο ο fai %s θα αποθηκευτεί"
+
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
+msgstr "s"
+
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
+msgstr "Πλήρης αυτοματοποιημένη εγκατάσταση"
+
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr "Ρυθμίσεις FAI"
+
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
+msgstr "Προφίλ FAI και έκδοση για να εφαρμοστεί σε αυτόν τον υπολογιστή"
+
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Έκδοση"
+
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr "'Έκδοση debian FAI για να εγκατατασταθεί σε αυτόν τον υπολογιστή"
+
+#: 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 "Προφίλ FAI για να εφαρμοστεί σε αυτόν τον υπολογιστή"
+
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Αποθετήριο"
+
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
+msgstr "Αποθετήριο FAI Debian που θα χρησιμοποιηθεί για αυτή την εγκατάσταση"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr "URL"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr " url αποθετηρίου"
+
+#: 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
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
+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 "Λειτουργία Mirror"
+
+#: 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 "Τοπικός mirror"
+
+#: 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/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Σφάλμα LDAP"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
+msgstr "Παρακολούθηση Argonaut FAI"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr "Ρυθμίσεις παρακολούθησης Argonaut FAI "
+
+#: 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 "Το όριο χρόνου για τους προβληματικούς πελάτες. 0 για απενεργοποίηση"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
+msgstr "Πιστοποιητικό CA"
+
+#: 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 ""
+
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr "Ταξινόμηση προς τα πάνω"
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr "Ταξινόμηση προς τα κάτω"
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Αρχείο"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Ημερομηνία"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr "Διαθέσιμες καταγραφές"
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr "Επιλεγμένο αρχείο καταγραφής"
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr "Το περιεχόμενο του επιλεγμένου αρχείου καταγραφής"
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr "Καταγραφές FAI "
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr "Εφαρμογή προβολής καταγραφών FAI "
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr "Επιλεγμένο αρχείο"
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr "Επιλεγμένο αρχείο: %s"
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr "Προσθήκη RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr "Προσθήκη LVM"
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Πίνακας κατατμήσεων"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "Πίνακας κατατμήσεων FAI"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Ιδιότητες"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Όνομα κλάσης"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr "Όνομα κλάσης πίνακα κατατμήσεων"
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
-msgstr "Δεν υπάρχουν κλάδοι FAI"
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Περιγραφή"
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
-msgstr "Παρακαλούμε, προσθέστε τουλάχιστον μια υπηρεσία αποθετηρίου για να δημιουργήσετε"
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr "Μια σύντομη περιγραφή της κλάσης"
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Δίσκοι"
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+msgstr "Κατατμήσεις σε αυτή την κλάση"
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+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_faiPackage.inc:166
 msgid "Mark for installation"
@@ -49,20 +406,10 @@ msgstr "Σήμανση για απεγκατάσταση"
 msgid "Edit configuration"
 msgstr "Επεξεργασία ρυθμίσεων"
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Σφάλμα LDAP"
-
 #: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
 msgid "Infrastructure service"
 msgstr "Άγνωτη υποδομή"
 
@@ -82,62 +429,15 @@ msgstr "Λίστα πακέτων FAI "
 msgid "FAI Package"
 msgstr "Πακέτο FAI"
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Ιδιότητες"
-
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Όνομα κλάσης"
-
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr "Όνομα κλάσης μεταβλητών"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Περιγραφή"
-
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr "Μια σύντομη περιγραφή της κλάσης"
-
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Αποθετήριο"
-
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Έκδοση"
-
 #: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr "Έκδοση Debian που σχετίζεται"
 
-#: 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 "Ενότητες που σχετίζονται"
@@ -158,36 +458,6 @@ msgstr "Πακέτα"
 msgid "Packages in this class"
 msgstr "Πακέτα σε αυτή την κλάση"
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr "Προσθήκη RAID"
-
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr "Προσθήκη LVM"
-
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Πίνακας κατατμήσεων"
-
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "Πίνακας κατατμήσεων FAI"
-
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
-msgstr "Όνομα κλάσης πίνακα κατατμήσεων"
-
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Δίσκοι"
-
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
-msgstr "Κατατμήσεις σε αυτή την κλάση"
-
 #: admin/fai/class_faiDiskEntry.inc:103
 msgid "encrypted"
 msgstr "κρυπτογραφημένο"
@@ -200,11 +470,6 @@ msgstr "εκκινήσιμο"
 msgid "preserve"
 msgstr "ρεζέρβα"
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Σφάλμα"
-
 #: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
@@ -224,11 +489,11 @@ msgstr "Καταχώριση πίνακα κατατμήσεων FAI"
 msgid "Device"
 msgstr "Συσκευή"
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Όνομα"
@@ -276,161 +541,54 @@ msgstr ""
 #: admin/fai/class_faiDiskEntry.inc:540
 msgid ""
 "You have more than four primary partition table entries in your "
-"configuration"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
-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/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Παρακαλώ επιλέξτε τις επιθυμητλες εγγραφές"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr "Έκδοση"
-
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Προφίλ"
-
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
-msgstr "Προφίλ FAI "
-
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
-msgstr "Προφίλ FAI "
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "Κλάσεις FAI"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
-msgstr "Κλάσεις FAI που είναι μέρος αυτού του προφίλ"
-
-#: 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\""
+"configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Προειδοποίηση"
-
-#: admin/fai/class_faiPackageConfiguration.inc:173
-#, php-format
+#: admin/fai/class_faiDiskEntry.inc:544
 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."
+"You cannot have more than three primary partition while using logical "
+"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_faiHook.inc:28
+msgid "Hook"
+msgstr "Hook"
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
-msgstr "Σενάριο εντολών FAI "
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr "FAI hook"
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Σενάρια"
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Hooks"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr "Μεταβλητές σε αυτή την κλάση"
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr "Το όνομα της μεταβλητής"
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr "Μια σύντομη περιγραφή της μεταβλητής"
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Προτεραιότητα"
-
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
-msgstr "Προτεραιότητα αυτού του σεναρίου (το μικρότερο γίνεται πρώτο)"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Εργασία"
 
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
-msgstr "Το σενάριο εντολών"
+msgid "Script"
+msgstr "Δέσμη ενεργειών"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr "Το σενάριο εντολών για αυτό το hook"
 
 #: admin/fai/class_faiTemplate.inc:136
 #, php-format
@@ -457,6 +615,33 @@ msgstr "Αρχεία προτύπων"
 msgid "Template files in this class"
 msgstr "Αρχεία προτύπων σε αυτή την κλάση"
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Προειδοποίηση"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -612,358 +797,180 @@ msgstr "ext3"
 
 #: admin/fai/class_faiPartition.inc:314
 msgid "ext4"
-msgstr "ext4"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr "reiser fs"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr "xfs"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr "btrfs"
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr "Σημείο προσάρτησης"
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr " Επιλογές"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr "Επιλογές δημιουργίας συστήματος αρχείων"
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr "Επιλογές ρύθμισης"
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr "RAID 0"
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr "RAID 1"
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr "RAID 5"
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr "RAID 6"
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr "Οι συστοιχίες Raid θα πρέπει να περιέχουν τουλάχιστον δύο κατατμήσεις!"
-
-#: admin/fai/class_faiPartition.inc:480
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr "Hook"
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr "FAI hook"
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Hooks"
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Εργασία"
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
-msgstr "Το σενάριο εντολών για αυτό το hook"
-
-#: 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 "Μεταβλητή FAI"
-
-#: admin/fai/class_faiVariable.inc:61
-msgid "Variables"
-msgstr "Μεταβλητές"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
-msgstr "Περιεχόμενο"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
-msgstr "Το περιεχόμενο της μεταβλητής."
-
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr "Ταξινόμηση προς τα πάνω"
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr "Ταξινόμηση προς τα κάτω"
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Αρχείο"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Ημερομηνία"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr "Διαθέσιμες καταγραφές"
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr "Επιλεγμένο αρχείο καταγραφής"
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr "Το περιεχόμενο του επιλεγμένου αρχείου καταγραφής"
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr "Καταγραφές FAI "
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr "Εφαρμογή προβολής καταγραφών FAI "
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr "Επιλεγμένο αρχείο"
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr "Επιλεγμένο αρχείο: %s"
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr "Ρυθμίσεις FAI"
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr "Προφίλ FAI και έκδοση για να εφαρμοστεί σε αυτόν τον υπολογιστή"
+msgstr "ext4"
 
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr "'Έκδοση debian FAI για να εγκατατασταθεί σε αυτόν τον υπολογιστή"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
+msgstr "reiser fs"
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr "Προφίλ"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
+msgstr "xfs"
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr "Προφίλ FAI για να εφαρμοστεί σε αυτόν τον υπολογιστή"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
+msgstr "btrfs"
 
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr "Αποθετήριο FAI Debian που θα χρησιμοποιηθεί για αυτή την εγκατάσταση"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
+msgstr "LVM/RAID"
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
-msgstr "Πλήρης αυτοματοποιημένη εγκατάσταση"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
+msgstr "Κρυπτογραφημένο"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
+msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
-msgstr " url αποθετηρίου"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
+msgstr "Σημείο προσάρτησης"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
-msgstr "Γονικός εξυπηρετητής"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
+msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
-msgstr "Αποθετήριο γονικού εξυπηρετητή"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
+msgstr " Επιλογές"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
-msgstr "Έκδοση που χρησιμοποιήθηκε αυτό το αποθετήριο"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
+msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
-msgstr "Διαθέσιμες ενότητες σε αυτό αποθετήριο."
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
+msgstr "Επιλογές δημιουργίας συστήματος αρχείων"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
-msgstr "Λειτουργία Mirror"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
+msgstr "Επιλογές ρύθμισης"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
-msgstr "Τοπικός mirror"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
+msgstr "Επιλογές προσάρτησης"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
-msgstr "Αρχιτεκτονικές"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
+msgstr "RAID 0"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
-msgstr "Διαθέσιμες αρχιτεκτονικές επεξεργαστών σε αυτό το αποθετήριο"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
+msgstr "RAID 1"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
-msgstr "Διανομή"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
+msgstr "RAID 5"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr "Για ποια διανομή είναι αυτό το αποθετήριο"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
+msgstr "RAID 6"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
-msgstr ""
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
+msgstr "Οι συστοιχίες Raid θα πρέπει να περιέχουν τουλάχιστον δύο κατατμήσεις!"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
-msgstr "Αποθετήριο πακέτων"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Προφίλ"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr "Πληροφορίε αποθετηρίου πακέτων"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr "Προφίλ FAI "
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr "Αποθετήρια"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr "Προφίλ FAI "
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
-msgstr "Αποθετήρια που φιλοξενεί αυτός ο εξυπηρετητής"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "Κλάσεις FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
-msgstr "Παρακολούθηση Argonaut FAI"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr "Κλάσεις FAI που είναι μέρος αυτού του προφίλ"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
-msgstr "Ρυθμίσεις παρακολούθησης Argonaut FAI "
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr "Διαχείριση πακέτων λογισμικού FAI και οδηγιών ανάπτυξης"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr "Θύρα"
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr "Δεν υπάρχουν κλάδοι FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
-msgstr ""
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
+msgstr "Παρακαλούμε, προσθέστε τουλάχιστον μια υπηρεσία αποθετηρίου για να δημιουργήσετε"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
-msgstr "Λήξη χρόνου:"
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
+msgstr "Μεταβλητή"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
-msgstr "Το όριο χρόνου για τους προβληματικούς πελάτες. 0 για απενεργοποίηση"
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
+msgstr "Μεταβλητή FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
-msgstr "Πιστοποιητικό CA"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
+msgstr "Μεταβλητές"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
+msgstr "Περιεχόμενο"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
-msgstr "Κατάλογος καταγραφών"
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
+msgstr "Το περιεχόμενο της μεταβλητής."
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
-msgstr ""
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "Σενάριο εντολών FAI "
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
-msgstr "Ρύθμιση FAI "
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Σενάρια"
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory fai"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Προτεραιότητα"
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
-msgstr ""
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
+msgstr "Προτεραιότητα αυτού του σεναρίου (το μικρότερο γίνεται πρώτο)"
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
-msgstr "Κλάδος στον οποίο τοι κλάδοι fai θα αποθηκεύονται"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr "Το σενάριο εντολών"
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Παρακαλώ επιλέξτε τις επιθυμητλες εγγραφές"
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
-msgstr "Σχετικός κλάδος στον οποίο ο fai %s θα αποθηκευτεί"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr "Έκδοση"
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
-msgstr "s"
+#: 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 "Το μέγιστο 200 εγγραφές θα φαίνονται εδώ."
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
 msgid "Update"
@@ -972,11 +979,3 @@ msgstr "Ενημέρωση"
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 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 "Το μέγιστο 200 εγγραφές θα φαίνονται εδώ."
diff --git a/fai/locale/es/fusiondirectory.po b/fai/locale/es/fusiondirectory.po
index ba81e9b3b2..24d5d5ed81 100644
--- a/fai/locale/es/fusiondirectory.po
+++ b/fai/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr "Parámetros FAI"
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
-msgstr "Paquete"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Versión"
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
-msgstr "Lista de paquetes FAI"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Propiedades"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Nombre de clase"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Repositorio"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Descripción"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr "URL"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Repositorio"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr "Servidor Origen"
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Versión"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Secciones"
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
-msgstr "Método de instalación"
-
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
-msgstr "Paquetes"
-
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr "Añadir RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Tabla de particiones"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "Tabla de particiones FAI"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Discos"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
-msgstr "encriptado"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
-msgstr "inicializable"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
-msgstr "preservar"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Error"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
-msgstr "Entrada en la tabla de particiones"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Error LDAP"
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
-msgstr "Entrada en la tabla de particiones FAI"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
-msgstr "Dispositivo"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "Nombre"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
+msgstr "Puerto"
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
-msgstr "clave fstab"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
-msgstr "Etiqueta"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
-msgstr "UUID"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
+msgstr "Directorio de rgistros"
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
-msgstr "Etiqueta de disco"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
-msgstr "Entradas en la partición"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
-msgstr "Particiones físicas combinadas"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Archivo"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Fecha"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr "Registros disponibles"
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr "Seleccionar registro"
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Error"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr "Añadir RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Tabla de particiones"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "Tabla de particiones FAI"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Propiedades"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Nombre de clase"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Descripción"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Discos"
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,128 +392,256 @@ msgstr "Acceso"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Por favor seleccione las entradas que desee"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr "Versión"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
+msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Perfil"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
+msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
-msgstr "Perfil FAI"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
+msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "Clases FAI"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
+msgstr "Paquete"
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
+msgstr "Lista de paquetes FAI"
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Aviso"
-
-#: 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."
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "Script"
-
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
-msgstr "Script FAI"
-
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Scripts"
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method"
+msgstr "Método de instalación"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
-msgid "Variables in this class"
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
-msgid "The name of the variable"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:431
+msgid "Packages"
+msgstr "Paquetes"
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
-msgid "A short description of the variable"
+#: admin/fai/class_faiPackage.inc:435
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Prioridad"
+#: admin/fai/class_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr "encriptado"
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr "inicializable"
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr "preservar"
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
-msgid "There are several files with the same path: %s"
+msgid ""
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
-msgid "Template"
-msgstr "Plantilla"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
+msgstr "Entrada en la tabla de particiones"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
-msgid "FAI template"
-msgstr "Plantilla FAI"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
+msgstr "Entrada en la tabla de particiones FAI"
 
-#: admin/fai/class_faiTemplate.inc:174
-msgid "Template class name"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr "Dispositivo"
 
-#: admin/fai/class_faiTemplate.inc:184
-msgid "Template files"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "Nombre"
 
-#: admin/fai/class_faiTemplate.inc:188
-msgid "Template files in this class"
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:30
-msgid "Type of sizing - fixed, dynamic or all remaining space"
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr "clave fstab"
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr "Etiqueta"
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr "UUID"
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr "Etiqueta de disco"
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr "Entradas en la partición"
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr "Particiones físicas combinadas"
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr "Método"
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr "Método FAI"
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Métodos"
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
+msgid "Variables in this class"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+msgid "The name of the variable"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
+msgid "A short description of the variable"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Tarea"
+
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
+msgstr "Script"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:151
+msgid "Template"
+msgstr "Plantilla"
+
+#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+msgid "FAI template"
+msgstr "Plantilla FAI"
+
+#: admin/fai/class_faiTemplate.inc:174
+msgid "Template class name"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:184
+msgid "Template files"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:188
+msgid "Template files in this class"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Aviso"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:30
+msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:33
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr "¡La matriz de discos RAID 0 solo puede ser creada con al menos una combinación de dos particiones!"
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr "Método"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Perfil"
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr "Método FAI"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr "Perfil FAI"
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Métodos"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Tarea"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "Clases FAI"
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,231 +934,41 @@ msgstr "Contenido"
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Archivo"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Fecha"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr "Registros disponibles"
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr "Seleccionar registro"
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr "Parámetros FAI"
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
-msgstr "Servidor Origen"
-
-#: 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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 "Puerto"
-
-#: 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 "Directorio de rgistros"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "Script FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
-msgstr ""
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Scripts"
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
-msgstr ""
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Prioridad"
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Por favor seleccione las entradas que desee"
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr "Versión"
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
+msgstr "Filtro"
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
+msgstr "Un máximo de 200 entradas serán enseñadas."
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
 msgid "Update"
@@ -970,11 +977,3 @@ msgstr "Actualizar"
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 msgstr "Enviar"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
-msgid "A maximum of 200 entries will be shown here."
-msgstr "Un máximo de 200 entradas serán enseñadas."
diff --git a/fai/locale/es_CO/fusiondirectory.po b/fai/locale/es_CO/fusiondirectory.po
index 1835f90d5c..d2aeaa19cb 100644
--- a/fai/locale/es_CO/fusiondirectory.po
+++ b/fai/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Error LDAP"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Propiedades"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Descripción"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Error LDAP"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Error"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
+msgstr "Puerto"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "Nombre"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr "Ordenar de modo inverso"
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr "Ordenar"
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Archivo"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Error"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Propiedades"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Descripción"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Por favor elija las entradas que desea"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Advertencia"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
+msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: 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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Hooks"
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Advertencia"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -533,443 +718,249 @@ 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:275
-msgid "Missing"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Wether or not this partition can be booted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:300
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Never"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Always"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Reinstall"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:311
-msgid "The filesystem this partition should be formatted with"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext2"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext3"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:480
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Hooks"
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
-msgstr ""
-
-#: 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:61
-msgid "Variables"
+msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size of this partition"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
+#: admin/fai/class_faiPartition.inc:256
+msgid "Flags"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr "Ordenar de modo inverso"
+#: admin/fai/class_faiPartition.inc:265
+msgid "Combined physical partitions in this RAID"
+msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr "Ordenar"
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare"
+msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Archivo"
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing"
+msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize existing partition"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Bootable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
+#: admin/fai/class_faiPartition.inc:300
+msgid "Preserve"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Never"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Always"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Reinstall"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
+#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+msgid "Filesystem"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:311
+msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
+#: admin/fai/class_faiPartition.inc:314
+msgid "swap space"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext2"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext3"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext4"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr "Puerto"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Enviar"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Por favor elija las entradas que desea"
+
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
 msgid "Filter"
@@ -978,3 +969,11 @@ msgstr "Filtro"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
+msgid "Update"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
+msgid "Submit"
+msgstr "Enviar"
diff --git a/fai/locale/es_VE/fusiondirectory.po b/fai/locale/es_VE/fusiondirectory.po
index d367c69d19..6b1259bdc8 100644
--- a/fai/locale/es_VE/fusiondirectory.po
+++ b/fai/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Error de LDAP"
-
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr "Parámetros FAI"
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
-msgstr "Paquete"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Versión"
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
-msgstr "Lista de paquetes FAI"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Propiedades"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Nombre de clase"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Repositorio"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Descripción"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr "URL"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Repositorio"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr "Servidor Origen"
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Versión"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Secciones"
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
-msgstr "Método de instalación"
-
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
-msgstr "Paquetes"
-
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr "Añadir RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Tabla de particiones"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "Tabla de particiones FAI"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Discos"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
-msgstr "encriptado"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
-msgstr "inicializable"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
-msgstr "preservar"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Error"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
-msgstr "Entrada en la tabla de particiones"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Error de LDAP"
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
-msgstr "Entrada en la tabla de particiones FAI"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
-msgstr "Dispositivo"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "Nombre"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
+msgstr "Puerto"
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
-msgstr "clave fstab"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
-msgstr "Etiqueta"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
-msgstr "UUID"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
+msgstr "Directorio de rgistros"
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
-msgstr "Etiqueta de disco"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
-msgstr "Entradas en la partición"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
-msgstr "Particiones físicas combinadas"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Archivo"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Fecha"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr "Registros disponibles"
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr "Seleccionar registro"
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Error"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr "Añadir RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Tabla de particiones"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "Tabla de particiones FAI"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Propiedades"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Nombre de clase"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Descripción"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Discos"
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,128 +392,256 @@ msgstr "Acceso"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Por favor seleccione las entradas que desee"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr "Versión"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
+msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Perfil"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
+msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
-msgstr "Perfil FAI"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
+msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "Clases FAI"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
+msgstr "Paquete"
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
+msgstr "Lista de paquetes FAI"
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Aviso"
-
-#: 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."
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "Script"
-
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
-msgstr "Script FAI"
-
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Scripts"
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method"
+msgstr "Método de instalación"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
-msgid "Variables in this class"
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
-msgid "The name of the variable"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:431
+msgid "Packages"
+msgstr "Paquetes"
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
-msgid "A short description of the variable"
+#: admin/fai/class_faiPackage.inc:435
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Prioridad"
+#: admin/fai/class_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr "encriptado"
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr "inicializable"
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr "preservar"
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
-msgid "There are several files with the same path: %s"
+msgid ""
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
-msgid "Template"
-msgstr "Plantilla"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
+msgstr "Entrada en la tabla de particiones"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
-msgid "FAI template"
-msgstr "Plantilla FAI"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
+msgstr "Entrada en la tabla de particiones FAI"
 
-#: admin/fai/class_faiTemplate.inc:174
-msgid "Template class name"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr "Dispositivo"
 
-#: admin/fai/class_faiTemplate.inc:184
-msgid "Template files"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "Nombre"
 
-#: admin/fai/class_faiTemplate.inc:188
-msgid "Template files in this class"
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:30
-msgid "Type of sizing - fixed, dynamic or all remaining space"
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr "clave fstab"
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr "Etiqueta"
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr "UUID"
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr "Etiqueta de disco"
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr "Entradas en la partición"
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr "Particiones físicas combinadas"
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr "Método"
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr "Método FAI"
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Métodos"
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
+msgid "Variables in this class"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+msgid "The name of the variable"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
+msgid "A short description of the variable"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Tarea"
+
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
+msgstr "Script"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:151
+msgid "Template"
+msgstr "Plantilla"
+
+#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+msgid "FAI template"
+msgstr "Plantilla FAI"
+
+#: admin/fai/class_faiTemplate.inc:174
+msgid "Template class name"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:184
+msgid "Template files"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:188
+msgid "Template files in this class"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Aviso"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:30
+msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:33
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr "¡La matriz de discos RAID 0 solo puede ser creada con al menos una combinación de dos particiones!"
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr "Método"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Perfil"
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr "Método FAI"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr "Perfil FAI"
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Métodos"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Tarea"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "Clases FAI"
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,231 +934,41 @@ msgstr "Contenido"
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Archivo"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Fecha"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr "Registros disponibles"
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr "Seleccionar registro"
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr "Parámetros FAI"
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
-msgstr "Servidor Origen"
-
-#: 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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 "Puerto"
-
-#: 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 "Directorio de rgistros"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "Script FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
-msgstr ""
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Scripts"
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
-msgstr ""
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Prioridad"
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Por favor seleccione las entradas que desee"
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr "Versión"
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
+msgstr "Filtro"
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
+msgstr "Un máximo de 200 entradas serán enseñadas."
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
 msgid "Update"
@@ -970,11 +977,3 @@ msgstr "Actualizar"
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 msgstr "Enviar"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
-msgid "A maximum of 200 entries will be shown here."
-msgstr "Un máximo de 200 entradas serán enseñadas."
diff --git a/fai/locale/fa_IR/fusiondirectory.po b/fai/locale/fa_IR/fusiondirectory.po
index 76e410594f..7d9c4db504 100644
--- a/fai/locale/fa_IR/fusiondirectory.po
+++ b/fai/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "خطای LDAP"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "خطای LDAP"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "خطا"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "خطا"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: 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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,230 +934,40 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 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/fi_FI/fusiondirectory.po b/fai/locale/fi_FI/fusiondirectory.po
index ef148cfd48..a09c88bde8 100644
--- a/fai/locale/fi_FI/fusiondirectory.po
+++ b/fai/locale/fi_FI/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-14 18:38+0000\n"
 "Last-Translator: Dina Solveig Jalkanen\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -19,22 +19,379 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr ""
+
+#: 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/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
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+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 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+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
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
+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/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "LDAP virhe"
+
+#: 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 "Portti"
+
+#: 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 ""
+
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Virhe"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Ominaisuudet"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Luokan nimi"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Kuvaus"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr "Luokan lyhyt kuvaus"
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+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_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: 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_faiPackage.inc:166
@@ -49,20 +406,10 @@ msgstr "Merkitse poistettavaksi"
 msgid "Edit configuration"
 msgstr "Muokkaa asetuksia"
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "LDAP virhe"
-
 #: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
 msgid "Infrastructure service"
 msgstr ""
 
@@ -82,62 +429,15 @@ msgstr ""
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Ominaisuudet"
-
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Luokan nimi"
-
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Kuvaus"
-
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr "Luokan lyhyt kuvaus"
-
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: 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 ""
@@ -158,36 +458,6 @@ msgstr ""
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
-msgstr ""
-
 #: admin/fai/class_faiDiskEntry.inc:103
 msgid "encrypted"
 msgstr ""
@@ -200,11 +470,6 @@ msgstr ""
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Virhe"
-
 #: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
@@ -224,11 +489,11 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nimi"
@@ -285,84 +550,69 @@ msgid ""
 "partitions"
 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"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:163
-msgid "Owner and group of the file"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "Owner"
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "File owner"
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "Group"
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "File group"
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access rights"
-msgstr ""
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
+msgstr "skripti"
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiTemplate.inc:151
+msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiTemplate.inc:174
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiTemplate.inc:184
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiTemplate.inc:188
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPackageConfiguration.inc:33
@@ -392,71 +642,6 @@ msgid ""
 "order to take effect."
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "skripti"
-
-#: 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:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
-msgid "Variables in this class"
-msgstr ""
-
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
-msgid "The name of the variable"
-msgstr ""
-
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
-msgid "A short description of the variable"
-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_faiTemplate.inc:136
-#, php-format
-msgid "There are several files with the same path: %s"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:151
-msgid "Template"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
-msgid "FAI template"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:174
-msgid "Template class name"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:184
-msgid "Template files"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:188
-msgid "Template files in this class"
-msgstr ""
-
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -699,24 +884,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -739,230 +936,40 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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 "Portti"
-
-#: 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"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -972,11 +979,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 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/fr/fusiondirectory.po b/fai/locale/fr/fusiondirectory.po
index 69e95b84e3..7e12e5ac80 100644
--- a/fai/locale/fr/fusiondirectory.po
+++ b/fai/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,23 +18,380 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr "Configuration FAI"
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr "Configuration du plugin FAI"
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
-msgstr "Gestion des paquets logiciels et recettes de déploiement FAI"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr "Branche FAI"
+
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
+msgstr "Branche dans laquelle les sous-branches FAI seront placées"
+
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
+msgstr "Sous-branche FAI %s"
+
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
+msgstr "Sous-branche relative dans laquelle les objets FAI %s seront stockés"
+
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
+msgstr "s"
+
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
+msgstr "Full automated installation"
+
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr "Paramètres FAI"
+
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
+msgstr "Profil FAI et version de Debian à appliquer pour ce système"
+
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Version"
+
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr "Version de Debian à installer sur ce système avec FAI"
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
+msgstr "Profil"
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr "Profil FAI à appliquer pour ce système"
+
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Dépôt"
+
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
+msgstr "Dépôt FAI à utiliser pour cette installation"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr "URL"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr "URL du dépôt"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr "Serveur parent"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr "Service de dépôt parent"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
+msgstr "Version utilisée sur ce dépôt"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
+msgstr "Sections"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
+msgstr "Sections disponibles sur ce dépôt"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
+msgstr "Type de miroir"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
+msgstr "Est ce que ce miroir est un dépôt d'installation ? Est-ce que sa version de Debian est personnalisée ?"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr "Miroir local"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
+msgstr "Est-ce un miroir local ou externe ?"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
+msgstr "Architectures"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
+msgstr "Architectures de processeur disponibles sur ce dépôt"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
+msgstr "Distribution"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
+msgstr "Pour quelle distribution est ce dépôt "
+
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
+msgstr "Modèle d’organisation, des répertoires du dépôt"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
+msgstr "Comment ce dépôt est organisé (uniquement pour les dépôts RPM)"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
+msgstr "Dépôt de paquets"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
+msgstr "Informations du dépôt de paquets"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
+msgstr "Dépôts"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
+msgstr "Dépôts fournis par ce serveur"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Erreur LDAP"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
+msgstr "Moniteur FAI Argonaut"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr "Paramètre du moniteur FAI Argonaut"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
+msgstr "Port"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+msgstr "Le port sur lequel argonaut-fai-monitor doit écouter. 4711 par défaut."
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
+msgstr "Temps d'attente maximum"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr "Le temps d’attente maximum d’attente d’un client. 0 pour désactiver."
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
+msgstr "Certificat CA"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+msgstr "Chemin du fichier contenant le certificat du CA public sur le serveur où tourne argonaut-fai-monitor"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
+msgstr "Répertoire des journaux systèmes"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr "Répertoire contenant les journaux systèmes de argonaut-fai-monitor"
+
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr "Tri décroissant"
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr "Tri croissant"
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Fichier"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Date"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr "Journaux systèmes disponibles"
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr "Journal système séléctionné"
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr "Contenu du journal système sélectionné"
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr "Journaux systèmes FAI"
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr "Afficheur de journaux systèmes FAI"
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Erreur"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr "Fichier sélectionné"
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr "Fichier sélectionné : %s"
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr "Ajouter du RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr "Ajouter un LVM"
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Table des partitions"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "Table des partitions FAI"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Propriétés"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Nom de la classe"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr "Nom de la classe de partition"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Description"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr "Une courte description de cette classe"
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
-msgstr "Il n'y a pas de branche FAI"
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Disques"
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
-msgstr "Veuillez ajouter au moins un service de dépôt pour créer celle-ci."
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+msgstr "Partitions dans cette classe"
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "File path"
+msgstr "Chemin complet"
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "Complete absolute template file path and name"
+msgstr "Chemin absolu du fichier de modèle"
+
+#: admin/fai/class_faiTemplateEntry.inc:146
+msgid "Short description of the file"
+msgstr "Une courte description du fichier"
+
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
+msgstr "Attributs du modèle"
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Template file content"
+msgstr "Contenu du modèle"
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Content of the template file"
+msgstr "Contenu du modèle"
+
+#: admin/fai/class_faiTemplateEntry.inc:163
+msgid "Owner and group of the file"
+msgstr "Propriétaire et groupe du fichier"
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "Owner"
+msgstr "Propriétaire"
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "File owner"
+msgstr "Propriétaire du fichier"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "Group"
+msgstr "Groupe"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "File group"
+msgstr "Groupe du fichier"
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access"
+msgstr "Accès"
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access rights"
+msgstr "Droits d'accès"
 
 #: admin/fai/class_faiPackage.inc:166
 msgid "Mark for installation"
@@ -48,20 +405,10 @@ msgstr "Marquer à enlever"
 msgid "Edit configuration"
 msgstr "Éditer la configuration"
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Erreur LDAP"
-
 #: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
 msgid "Infrastructure service"
 msgstr "Service d’infrastructure"
 
@@ -81,62 +428,15 @@ msgstr "Liste de paquets FAI"
 msgid "FAI Package"
 msgstr "Paquet FAI"
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Propriétés"
-
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Nom de la classe"
-
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr "Nom de la classe variables"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Description"
-
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr "Une courte description de cette classe"
-
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Dépôt"
-
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Version"
-
 #: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr "La version de Debian concernée"
 
-#: admin/fai/class_faiPackage.inc:416
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr "Sections"
-
 #: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr "Les sections concernées"
@@ -157,36 +457,6 @@ msgstr "Paquets"
 msgid "Packages in this class"
 msgstr "Paquets dans cette classe"
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr "Ajouter du RAID"
-
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr "Ajouter un LVM"
-
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Table des partitions"
-
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "Table des partitions FAI"
-
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
-msgstr "Nom de la classe de partition"
-
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Disques"
-
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
-msgstr "Partitions dans cette classe"
-
 #: admin/fai/class_faiDiskEntry.inc:103
 msgid "encrypted"
 msgstr "chiffré"
@@ -199,11 +469,6 @@ msgstr "amorçable"
 msgid "preserve"
 msgstr "préserver"
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Erreur"
-
 #: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
@@ -223,11 +488,11 @@ msgstr "Entrée de la table de partition FAI"
 msgid "Device"
 msgstr "Périphérique"
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nom"
@@ -279,157 +544,50 @@ msgid ""
 msgstr "Vous avez plus de quatre partitions primaires dans votre configuration."
 
 #: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
-msgstr "Vous ne pouvez pas avoir plus de trois partitions primaires quand vous utilisez des partitions logiques."
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-msgid "File path"
-msgstr "Chemin complet"
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-msgid "Complete absolute template file path and name"
-msgstr "Chemin absolu du fichier de modèle"
-
-#: admin/fai/class_faiTemplateEntry.inc:146
-msgid "Short description of the file"
-msgstr "Une courte description du fichier"
-
-#: admin/fai/class_faiTemplateEntry.inc:155
-msgid "Template attributes"
-msgstr "Attributs du modèle"
-
-#: admin/fai/class_faiTemplateEntry.inc:159
-msgid "Template file content"
-msgstr "Contenu du modèle"
-
-#: admin/fai/class_faiTemplateEntry.inc:159
-msgid "Content of the template file"
-msgstr "Contenu du modèle"
-
-#: admin/fai/class_faiTemplateEntry.inc:163
-msgid "Owner and group of the file"
-msgstr "Propriétaire et groupe du fichier"
-
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "Owner"
-msgstr "Propriétaire"
-
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "File owner"
-msgstr "Propriétaire du fichier"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "Group"
-msgstr "Groupe"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "File group"
-msgstr "Groupe du fichier"
-
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access"
-msgstr "Accès"
-
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access rights"
-msgstr "Droits d'accès"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Veuillez sélectionner les entrées désirées"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr "Version"
-
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Profil"
-
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
-msgstr "Profil FAI"
-
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
-msgstr "Profil FAI"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "Classes FAI"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
-msgstr "Classes FAI qui font partie de ce profil"
-
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
-msgstr "Configuration des paquets FAI"
-
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
-msgstr "Configurer les options debconf d'un paquet"
-
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
-msgstr "Information Debconf pour le paquet \"%s\""
-
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Avertissement"
-
-#: 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 "les questions debconf \"%s\" sont générée dynamiquement pendant l'installation du paquet et nécessite le choix entre différentes options qui ne peuvent pas être affichées ici. Le texte entré doit être un de ces choix pour être valide."
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr "Vous ne pouvez pas avoir plus de trois partitions primaires quand vous utilisez des partitions logiques."
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "Script"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr "Hook"
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
-msgstr "Script FAI"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr "Hook FAI"
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Scripts"
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Hooks"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr "Variables dans cette classe"
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr "Nom de la variable"
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr "Une courte description de cette variable"
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Priorité"
-
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
-msgstr "Priorité de ce script (la plus petite vient en premier)"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Tâches"
 
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
-msgstr "Le script en lui même"
+msgid "Script"
+msgstr "Script"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr "Le script de ce hook"
 
 #: admin/fai/class_faiTemplate.inc:136
 #, php-format
@@ -456,6 +614,33 @@ msgstr "Fichiers du modèle"
 msgid "Template files in this class"
 msgstr "Fichiers de modèle de cette classe"
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr "Configuration des paquets FAI"
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr "Configurer les options debconf d'un paquet"
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr "Information Debconf pour le paquet \"%s\""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Avertissement"
+
+#: 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 "les questions debconf \"%s\" sont générée dynamiquement pendant l'installation du paquet et nécessite le choix entre différentes options qui ne peuvent pas être affichées ici. Le texte entré doit être un de ces choix pour être valide."
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr "Type de partitionnement - fixe, dynamique ou place restante"
@@ -610,367 +795,173 @@ msgid "ext3"
 msgstr "ext3"
 
 #: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr "ext4"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr "reiser fs"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr "xfs"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr "btrfs"
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr "Point de montage"
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr "Point de montage pour cette partition"
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr "Options"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr "Créer des options"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr "Options de création du système de fichier"
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr "Options de tuning"
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr "RAID 0"
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr "RAID 1"
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr "RAID 5"
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr "RAID 6"
-
-#: admin/fai/class_faiPartition.inc:478
-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
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "Les ensembles RAID 0 ne peuvent être réalisés qu'avec deux partitions !"
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr "Hook"
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr "Hook FAI"
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Hooks"
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Tâches"
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
-msgstr "Le script de ce hook"
-
-#: admin/fai/class_faiVariable.inc:28
-msgid "Variable"
-msgstr "Variable"
-
-#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
-msgid "FAI variable"
-msgstr "Variable FAI"
-
-#: admin/fai/class_faiVariable.inc:61
-msgid "Variables"
-msgstr "Variables"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
-msgstr "Contenu"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
-msgstr "Le contenu de la variable"
-
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr "Tri décroissant"
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr "Tri croissant"
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Fichier"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Date"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr "Journaux systèmes disponibles"
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr "Journal système séléctionné"
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr "Contenu du journal système sélectionné"
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr "Journaux systèmes FAI"
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr "Afficheur de journaux systèmes FAI"
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr "Fichier sélectionné"
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr "Fichier sélectionné : %s"
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr "Paramètres FAI"
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr "Profil FAI et version de Debian à appliquer pour ce système"
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr "Version de Debian à installer sur ce système avec FAI"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr "Profil"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr "Profil FAI à appliquer pour ce système"
+msgid "ext4"
+msgstr "ext4"
 
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr "Dépôt FAI à utiliser pour cette installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
+msgstr "reiser fs"
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
-msgstr "Full automated installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
+msgstr "xfs"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
+msgstr "btrfs"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
-msgstr "URL du dépôt"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
+msgstr "LVM/RAID"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
-msgstr "Serveur parent"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
+msgstr "Chiffré"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
-msgstr "Service de dépôt parent"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
+msgstr "Si oui ou non cette partition est chiffré"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
-msgstr "Version utilisée sur ce dépôt"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
+msgstr "Point de montage"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
-msgstr "Sections disponibles sur ce dépôt"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
+msgstr "Point de montage pour cette partition"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
-msgstr "Type de miroir"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
+msgstr "Options"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
-msgstr "Est ce que ce miroir est un dépôt d'installation ? Est-ce que sa version de Debian est personnalisée ?"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
+msgstr "Créer des options"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
-msgstr "Miroir local"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
+msgstr "Options de création du système de fichier"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
-msgstr "Est-ce un miroir local ou externe ?"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
+msgstr "Options de tuning"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
-msgstr "Architectures"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
+msgstr "Options de tuning du système de fichier"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
-msgstr "Architectures de processeur disponibles sur ce dépôt"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
+msgstr "Options de montage"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
-msgstr "Distribution"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
+msgstr "Options de montage du système de fichier"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr "Pour quelle distribution est ce dépôt "
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
+msgstr "RAID 0"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
-msgstr "Modèle d’organisation, des répertoires du dépôt"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
+msgstr "RAID 1"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
-msgstr "Comment ce dépôt est organisé (uniquement pour les dépôts RPM)"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
+msgstr "RAID 5"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
-msgstr "Dépôt de paquets"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
+msgstr "RAID 6"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr "Informations du dépôt de paquets"
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
+msgstr "Les ensembles RAID doivent contenir au moins 2 partitions !"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr "Dépôts"
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
+msgstr "Les ensembles RAID 0 ne peuvent être réalisés qu'avec deux partitions !"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
-msgstr "Dépôts fournis par ce serveur"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Profil"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
-msgstr "Moniteur FAI Argonaut"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr "Profil FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
-msgstr "Paramètre du moniteur FAI Argonaut"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr "Profil FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr "Port"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "Classes FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
-msgstr "Le port sur lequel argonaut-fai-monitor doit écouter. 4711 par défaut."
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr "Classes FAI qui font partie de ce profil"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
-msgstr "Temps d'attente maximum"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr "Gestion des paquets logiciels et recettes de déploiement FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
-msgstr "Le temps d’attente maximum d’attente d’un client. 0 pour désactiver."
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr "Il n'y a pas de branche FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
-msgstr "Certificat CA"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
+msgstr "Veuillez ajouter au moins un service de dépôt pour créer celle-ci."
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr "Chemin du fichier contenant le certificat du CA public sur le serveur où tourne argonaut-fai-monitor"
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
+msgstr "Variable"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
-msgstr "Répertoire des journaux systèmes"
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
+msgstr "Variable FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
-msgstr "Répertoire contenant les journaux systèmes de argonaut-fai-monitor"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
+msgstr "Variables"
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
-msgstr "Configuration FAI"
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
+msgstr "Contenu"
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
-msgstr "Configuration du plugin FAI"
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
+msgstr "Le contenu de la variable"
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
-msgstr "Branche FAI"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "Script FAI"
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
-msgstr "Branche dans laquelle les sous-branches FAI seront placées"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Scripts"
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
-msgstr "Sous-branche FAI %s"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Priorité"
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
-msgstr "Sous-branche relative dans laquelle les objets FAI %s seront stockés"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
+msgstr "Priorité de ce script (la plus petite vient en premier)"
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
-msgstr "s"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr "Le script en lui même"
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Mise à jour"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Veuillez sélectionner les entrées désirées"
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Soumettre"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr "Version"
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
 msgid "Filter"
@@ -979,3 +970,11 @@ msgstr "Filtre"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Un maximum de 200 entrées seront montrées ici."
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
+msgid "Update"
+msgstr "Mise à jour"
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
+msgid "Submit"
+msgstr "Soumettre"
diff --git a/fai/locale/hu_HU/fusiondirectory.po b/fai/locale/hu_HU/fusiondirectory.po
index c0143d8f3d..4b3c7bc42a 100644
--- a/fai/locale/hu_HU/fusiondirectory.po
+++ b/fai/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Leírás"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "Név"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Leírás"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: 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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "Név"
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,230 +934,40 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 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/id/fusiondirectory.po b/fai/locale/id/fusiondirectory.po
index 53bf30c10e..b3db109fc8 100644
--- a/fai/locale/id/fusiondirectory.po
+++ b/fai/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: 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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,230 +934,40 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 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/it_IT/fusiondirectory.po b/fai/locale/it_IT/fusiondirectory.po
index 130924fb3c..4496c5e118 100644
--- a/fai/locale/it_IT/fusiondirectory.po
+++ b/fai/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -18,23 +18,380 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr "Configurazione FAI"
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr "Configurazione del plugin FAI di FusionDirectory"
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
-msgstr "Gestire i pacchetti software e le ricette di implementazione di FAI"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr "Base FAI RDN"
+
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
+msgstr "Ramo nel quale i rami FAI saranno immagazzinati"
+
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
+msgstr "%s FAI RDN"
+
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
+msgstr "Ramo relativo in cui verranno memorizzati FAI %s"
+
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
+msgstr "%s"
+
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
+msgstr "Installazione completa automatizzata"
+
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr "Impostazioni FAI"
+
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
+msgstr "Profilo e Release FAI da applicare a questo computer"
+
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Versione"
+
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr "Release Debian per FAI da installare in questo computer"
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
+msgstr "Profilo"
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr "Profilo FAI da applicare a questo computer"
+
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Deposito"
+
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
+msgstr "Repository Debian per FAI da usare per l'installazione"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr "URL"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr "URL del repository"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr "Server genitore"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr "Server di repository genitore"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
+msgstr "Release utilizzata in questo repository"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
+msgstr "Sezioni"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
+msgstr "Sezioni disponibili in questo repository"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
+msgstr "Modo Mirror"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
+msgstr "Questo Mirror è un repository d'installazione? La sua Release è personalizzata?"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr "Mirror locale"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
+msgstr "Questo è un Mirror locale a di rete ?"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
+msgstr "Architetture"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
+msgstr "Architetture di processori disponibili su questo repository"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
+msgstr "Distribuzione"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
+msgstr "La sezione di distribuzioni fornita da questo repository"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
+msgstr "Modello di path"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
+msgstr "Com'é organizzato il repository (solo per repository RPM)"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
+msgstr "Pacchetto del repository"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
+msgstr "Informazioni sul pacchetto del repository"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
+msgstr "Repositories"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
+msgstr "Repository che questo server ospita"
+
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Errore LDAP"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
+msgstr "Monitor FAI di Argonaut"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr "Impostazioni del monitor FAI di Argonaut"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
+msgstr "Porta"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+msgstr "Il port del monitor FAI di Argonaut dovrebbe essere in ascolto. l valore predefinito è 4711 ."
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
+msgstr "Tempo di attesa massimo"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr "Il timeout per i clienti sbaglati. 0 per disabilitare."
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
+msgstr "Certificato CA"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+msgstr "Percorso del file contenente il certificato CA sul server monitor FAI di Argonaut"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
+msgstr "Cartella degli errori"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr "Directory nel quale argonaut-fai-monitor immagazzinerà i propri log"
+
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr "Ordina in modo decrescente"
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr "Ordina in modo crescente"
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "File"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Data"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr "Logs di sistema disponibili"
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr "Logs di sistema selezionato"
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr "Contenuto del log selezionato"
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr "Connessioni FAI"
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr "Connessioni FAI"
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Errore"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr "File selezionato"
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr "File selezionato: %s "
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr "Aggiungi il RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr "Aggiungi LVM"
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Tavola delle partizioni"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "Tavola delle partizioni FAI"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Proprietà"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Nome della classe"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr "Nome della tavola delle partizioni"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Descrizione"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr "Breve descrizione della classe"
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
-msgstr "Non ci sono rami FAI"
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Dischi"
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
-msgstr "Prego aggiungere almeno un servizio repository per creare questi"
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+msgstr "Partizioni in questa classe"
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "File path"
+msgstr "Percorso del file"
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "Complete absolute template file path and name"
+msgstr "Completa il percorso e il nome del file modello assoluto"
+
+#: admin/fai/class_faiTemplateEntry.inc:146
+msgid "Short description of the file"
+msgstr "Breve descrizione del file"
+
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
+msgstr "Attributi dei modelli"
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Template file content"
+msgstr "Contenuto del file modello"
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Content of the template file"
+msgstr "Contenuto del file modello"
+
+#: admin/fai/class_faiTemplateEntry.inc:163
+msgid "Owner and group of the file"
+msgstr "Proprietario e gruppo del file"
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "Owner"
+msgstr "Propietario"
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "File owner"
+msgstr "Propietario del file"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "Group"
+msgstr "Gruppo"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "File group"
+msgstr "Gruppi di file"
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access"
+msgstr "Accesso"
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access rights"
+msgstr "Opzioni di accesso"
 
 #: admin/fai/class_faiPackage.inc:166
 msgid "Mark for installation"
@@ -48,20 +405,10 @@ msgstr "Marca per la rimozione"
 msgid "Edit configuration"
 msgstr "Modifica configurazione"
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Errore LDAP"
-
 #: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
 msgid "Infrastructure service"
 msgstr "Servizio d'infrastruttura"
 
@@ -81,62 +428,15 @@ msgstr "Elenco dei pacchetti FAI"
 msgid "FAI Package"
 msgstr "Pacchetto FAI"
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Proprietà"
-
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Nome della classe"
-
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr "Nome di classe variabile"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Descrizione"
-
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr "Breve descrizione della classe"
-
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Deposito"
-
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Versione"
-
 #: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr "Versione Debian da installare"
 
-#: admin/fai/class_faiPackage.inc:416
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr "Sezioni"
-
 #: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr "Sezioni interessate"
@@ -157,36 +457,6 @@ msgstr "Pacchetti"
 msgid "Packages in this class"
 msgstr "Pacchetti in questa classe"
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr "Aggiungi il RAID"
-
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr "Aggiungi LVM"
-
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Tavola delle partizioni"
-
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "Tavola delle partizioni FAI"
-
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
-msgstr "Nome della tavola delle partizioni"
-
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Dischi"
-
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
-msgstr "Partizioni in questa classe"
-
 #: admin/fai/class_faiDiskEntry.inc:103
 msgid "encrypted"
 msgstr "criptato"
@@ -199,11 +469,6 @@ msgstr "Avviabile"
 msgid "preserve"
 msgstr "preserve"
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Errore"
-
 #: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
@@ -223,11 +488,11 @@ msgstr "Elenco della tavola delle partizioni FAI"
 msgid "Device"
 msgstr "Dispositivi"
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nome"
@@ -279,157 +544,50 @@ msgid ""
 msgstr "Ci sono più di quattro partizioni primarie nella tua configurazione"
 
 #: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
-msgstr "Non puoi avere più di 3 partizioni primarie quando usi delle partizioni logiche"
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-msgid "File path"
-msgstr "Percorso del file"
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-msgid "Complete absolute template file path and name"
-msgstr "Completa il percorso e il nome del file modello assoluto"
-
-#: admin/fai/class_faiTemplateEntry.inc:146
-msgid "Short description of the file"
-msgstr "Breve descrizione del file"
-
-#: admin/fai/class_faiTemplateEntry.inc:155
-msgid "Template attributes"
-msgstr "Attributi dei modelli"
-
-#: admin/fai/class_faiTemplateEntry.inc:159
-msgid "Template file content"
-msgstr "Contenuto del file modello"
-
-#: admin/fai/class_faiTemplateEntry.inc:159
-msgid "Content of the template file"
-msgstr "Contenuto del file modello"
-
-#: admin/fai/class_faiTemplateEntry.inc:163
-msgid "Owner and group of the file"
-msgstr "Proprietario e gruppo del file"
-
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "Owner"
-msgstr "Propietario"
-
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "File owner"
-msgstr "Propietario del file"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "Group"
-msgstr "Gruppo"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "File group"
-msgstr "Gruppi di file"
-
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access"
-msgstr "Accesso"
-
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access rights"
-msgstr "Opzioni di accesso"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Seleziona le entries desiderate"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr "Versione"
-
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Profilo"
-
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
-msgstr "Profilo FAI"
-
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
-msgstr "Profilo FAI"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "Classi FAI"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
-msgstr "Classi di FAI appartenenti a questo profilo"
-
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
-msgstr "Pacchetto di configurazione FAI"
-
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
-msgstr "Configura le opzioni debconf di un pacchetto"
-
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
-msgstr "Informazione Debconf per il pacchetto '%s'"
-
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: 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 "Queste domande debconf \"%s\" vengono generate dinamicamente durante l'installazione del pacchetto e richiedono di scegliere tra le opzioni specifiche che non possono essere presentate qui. Al fine di avere effetto il testo inserito deve essere una delle scelte valide."
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr "Non puoi avere più di 3 partizioni primarie quando usi delle partizioni logiche"
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "Script"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr "Connessioni"
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
-msgstr "Script FAI"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr "Connessioni FAI"
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Scripts"
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Connessioni"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr "Variabili di questa classe"
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr "Nome della variabile"
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr "Breve descrizione della variabile"
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Priorità"
-
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
-msgstr "Priorità di questo script (i più piccoli saranno i primi)"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Attività"
 
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
-msgstr "Lo script stesso"
+msgid "Script"
+msgstr "Script"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr "Lo script di questo hook"
 
 #: admin/fai/class_faiTemplate.inc:136
 #, php-format
@@ -456,6 +614,33 @@ msgstr "Modelli di file"
 msgid "Template files in this class"
 msgstr "File modello di questa classe"
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr "Pacchetto di configurazione FAI"
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr "Configura le opzioni debconf di un pacchetto"
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr "Informazione Debconf per il pacchetto '%s'"
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Avvertimento"
+
+#: 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 "Queste domande debconf \"%s\" vengono generate dinamicamente durante l'installazione del pacchetto e richiedono di scegliere tra le opzioni specifiche che non possono essere presentate qui. Al fine di avere effetto il testo inserito deve essere una delle scelte valide."
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr "Tipo di dimensionamento - fisso , dinamico o tutto lo spazio rimanente"
@@ -610,367 +795,173 @@ msgid "ext3"
 msgstr "ext3"
 
 #: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr "ext4"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr "reiser fs"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr "xfs"
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr "btrfs"
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr "Punto di montaggio"
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr "Punto culminante per questa partizione"
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr "Opzioni"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr "Creare opzioni"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr "Opzioni per la creazione del file system"
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr "Opzioni di tuning"
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr "RAID 0"
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr "RAID 1"
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr "RAID 5"
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr "RAID 6"
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr "Gli arrays RAID devono contenere almeno 2 partizioni !"
-
-#: admin/fai/class_faiPartition.inc:480
-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 !"
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr "Connessioni"
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr "Connessioni FAI"
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Connessioni"
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Attività"
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
-msgstr "Lo script di questo hook"
-
-#: admin/fai/class_faiVariable.inc:28
-msgid "Variable"
-msgstr "Variabile"
-
-#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
-msgid "FAI variable"
-msgstr "Variabile FAI"
-
-#: admin/fai/class_faiVariable.inc:61
-msgid "Variables"
-msgstr "Variabili"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
-msgstr "Contenuto"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
-msgstr "Contenuto della variabile"
-
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr "Ordina in modo decrescente"
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr "Ordina in modo crescente"
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "File"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Data"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr "Logs di sistema disponibili"
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr "Logs di sistema selezionato"
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr "Contenuto del log selezionato"
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr "Connessioni FAI"
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr "Connessioni FAI"
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr "File selezionato"
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr "File selezionato: %s "
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr "Impostazioni FAI"
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr "Profilo e Release FAI da applicare a questo computer"
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr "Release Debian per FAI da installare in questo computer"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr "Profilo"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr "Profilo FAI da applicare a questo computer"
+msgid "ext4"
+msgstr "ext4"
 
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr "Repository Debian per FAI da usare per l'installazione"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
+msgstr "reiser fs"
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
-msgstr "Installazione completa automatizzata"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
+msgstr "xfs"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
+msgstr "btrfs"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
-msgstr "URL del repository"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
+msgstr "LVM/RAID "
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
-msgstr "Server genitore"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
+msgstr "Criptato"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
-msgstr "Server di repository genitore"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
+msgstr "Se questa partizione é criptata o no"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
-msgstr "Release utilizzata in questo repository"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
+msgstr "Punto di montaggio"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
-msgstr "Sezioni disponibili in questo repository"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
+msgstr "Punto culminante per questa partizione"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
-msgstr "Modo Mirror"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
+msgstr "Opzioni"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
-msgstr "Questo Mirror è un repository d'installazione? La sua Release è personalizzata?"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
+msgstr "Creare opzioni"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
-msgstr "Mirror locale"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
+msgstr "Opzioni per la creazione del file system"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
-msgstr "Questo è un Mirror locale a di rete ?"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
+msgstr "Opzioni di tuning"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
-msgstr "Architetture"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
+msgstr "Opzioni di filesystem tune"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
-msgstr "Architetture di processori disponibili su questo repository"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
+msgstr "Opzioni di montaggio"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
-msgstr "Distribuzione"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
+msgstr "Opzioni di montaggio filesystem"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr "La sezione di distribuzioni fornita da questo repository"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
+msgstr "RAID 0"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
-msgstr "Modello di path"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
+msgstr "RAID 1"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
-msgstr "Com'é organizzato il repository (solo per repository RPM)"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
+msgstr "RAID 5"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
-msgstr "Pacchetto del repository"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
+msgstr "RAID 6"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr "Informazioni sul pacchetto del repository"
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
+msgstr "Gli arrays RAID devono contenere almeno 2 partizioni !"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr "Repositories"
+#: admin/fai/class_faiPartition.inc:480
+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 !"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
-msgstr "Repository che questo server ospita"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Profilo"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
-msgstr "Monitor FAI di Argonaut"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr "Profilo FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
-msgstr "Impostazioni del monitor FAI di Argonaut"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr "Profilo FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr "Porta"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "Classi FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
-msgstr "Il port del monitor FAI di Argonaut dovrebbe essere in ascolto. l valore predefinito è 4711 ."
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr "Classi di FAI appartenenti a questo profilo"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
-msgstr "Tempo di attesa massimo"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr "Gestire i pacchetti software e le ricette di implementazione di FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
-msgstr "Il timeout per i clienti sbaglati. 0 per disabilitare."
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr "Non ci sono rami FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
-msgstr "Certificato CA"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
+msgstr "Prego aggiungere almeno un servizio repository per creare questi"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr "Percorso del file contenente il certificato CA sul server monitor FAI di Argonaut"
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
+msgstr "Variabile"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
-msgstr "Cartella degli errori"
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
+msgstr "Variabile FAI"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
-msgstr "Directory nel quale argonaut-fai-monitor immagazzinerà i propri log"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
+msgstr "Variabili"
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
-msgstr "Configurazione FAI"
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
+msgstr "Contenuto"
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
-msgstr "Configurazione del plugin FAI di FusionDirectory"
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
+msgstr "Contenuto della variabile"
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
-msgstr "Base FAI RDN"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "Script FAI"
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
-msgstr "Ramo nel quale i rami FAI saranno immagazzinati"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Scripts"
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
-msgstr "%s FAI RDN"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Priorità"
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
-msgstr "Ramo relativo in cui verranno memorizzati FAI %s"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
+msgstr "Priorità di questo script (i più piccoli saranno i primi)"
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
-msgstr "%s"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr "Lo script stesso"
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Aggiornamento"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Seleziona le entries desiderate"
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Invia"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr "Versione"
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
 msgid "Filter"
@@ -979,3 +970,11 @@ msgstr "Filtro"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr "Saranno mostrate un massimo di 200 entries."
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
+msgid "Update"
+msgstr "Aggiornamento"
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
+msgid "Submit"
+msgstr "Invia"
diff --git a/fai/locale/lv/fusiondirectory.po b/fai/locale/lv/fusiondirectory.po
index 8493c8def0..6feb592e53 100644
--- a/fai/locale/lv/fusiondirectory.po
+++ b/fai/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "LDAP kļūda"
-
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Krātuve "
+
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Apraksts"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Krātuve "
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "LDAP kļūda"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Kļūda"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "Vārds "
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Kļūda"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Apraksts"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
+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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
-msgid "Debconf information for package \"%s\""
+msgid ""
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Brīdinājums"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "Vārds "
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
-#, php-format
+#: admin/fai/class_faiDiskEntry.inc:544
 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."
+"You cannot have more than three primary partition while using logical "
+"partitions"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Brīdinājums"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -523,452 +708,258 @@ msgstr ""
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
-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:275
-msgid "Missing"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Wether or not this partition can be booted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:300
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Never"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Always"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Reinstall"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:311
-msgid "The filesystem this partition should be formatted with"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext2"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext3"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:480
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
+#: admin/fai/class_faiPartition.inc:375
+msgid "Logical"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:28
-msgid "Variable"
+#: admin/fai/class_faiPartition.inc:240
+msgid "Partition name"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
-msgid "FAI variable"
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:61
-msgid "Variables"
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size of this partition"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
+#: admin/fai/class_faiPartition.inc:256
+msgid "Flags"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
+#: admin/fai/class_faiPartition.inc:265
+msgid "Combined physical partitions in this RAID"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize existing partition"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Bootable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
+#: admin/fai/class_faiPartition.inc:300
+msgid "Preserve"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Never"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Always"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Reinstall"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
+#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+msgid "Filesystem"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
+#: admin/fai/class_faiPartition.inc:311
+msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:314
+msgid "swap space"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext2"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext3"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext4"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
@@ -978,3 +969,11 @@ msgstr "Filtrs"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
+msgid "Update"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
+msgid "Submit"
+msgstr ""
diff --git a/fai/locale/nb/fusiondirectory.po b/fai/locale/nb/fusiondirectory.po
index ad625d2b97..07f204fb83 100644
--- a/fai/locale/nb/fusiondirectory.po
+++ b/fai/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "LDAP-feil"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Egenskaper"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Beskrivelse"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "LDAP-feil"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Feil"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "Navn"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Feil"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
+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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
-msgid "Debconf information for package \"%s\""
+msgid ""
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "Navn"
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
-#, php-format
+#: admin/fai/class_faiDiskEntry.inc:544
 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."
+"You cannot have more than three primary partition while using logical "
+"partitions"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -523,452 +708,258 @@ msgstr ""
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
-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:275
-msgid "Missing"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Wether or not this partition can be booted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:300
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Never"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Always"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Reinstall"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:311
-msgid "The filesystem this partition should be formatted with"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext2"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext3"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:480
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
+#: admin/fai/class_faiPartition.inc:375
+msgid "Logical"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:28
-msgid "Variable"
+#: admin/fai/class_faiPartition.inc:240
+msgid "Partition name"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
-msgid "FAI variable"
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:61
-msgid "Variables"
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size of this partition"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
+#: admin/fai/class_faiPartition.inc:256
+msgid "Flags"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
+#: admin/fai/class_faiPartition.inc:265
+msgid "Combined physical partitions in this RAID"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize existing partition"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Bootable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
+#: admin/fai/class_faiPartition.inc:300
+msgid "Preserve"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Never"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Always"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Reinstall"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
+#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+msgid "Filesystem"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
+#: admin/fai/class_faiPartition.inc:311
+msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:314
+msgid "swap space"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext2"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext3"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext4"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
@@ -978,3 +969,11 @@ msgstr "Filter"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
+msgid "Update"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
+msgid "Submit"
+msgstr ""
diff --git a/fai/locale/nl/fusiondirectory.po b/fai/locale/nl/fusiondirectory.po
index 39625b3dc0..af3ed0d6cd 100644
--- a/fai/locale/nl/fusiondirectory.po
+++ b/fai/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
-msgstr "Beheer FAI software pakketten and deployment recepten"
-
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "LDAP fout"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
+msgstr "Volautomatische installatie"
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr "FAI instellingen"
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
-msgstr "Onbekende pakketen"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
+msgstr "FAI profiel en release om toe te passen op deze computer"
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
-msgstr "Pakket"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Distributie versie"
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
-msgstr "FAI pakket lijst"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr "FAI debian release om te installeren op deze computer"
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
-msgstr "FAI pakket"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
+msgstr "Profiel"
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Eigenschappen"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr "FAI profiel om toe te passen op deze computer"
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Klassenaam"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Verzamelplaats"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
+msgstr "FAI Debian repository om te gebruiken voor de installatie"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Omschrijving"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr "URL"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr ""
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr "Repository url"
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Verzamelplaats"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr "Parent server"
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Distributie versie"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr "Parent repository server"
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Secties"
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
-msgstr "Installatie methode"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
+msgstr "Mirror mode"
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
-msgstr ""
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
+msgstr "In deze mirror een installatie repository ? Is zijn uitgave aangepast ?"
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
-msgstr "Pakketten"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr "Lokale mirror"
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
-msgstr ""
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
+msgstr "Is this mirror een lokale of een network mirror ?"
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr "Raid toevoegen"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
+msgstr "Architectures"
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr ""
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
+msgstr "Processor architecturen beschikbaar op deze repository "
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Partitietabel"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "FAI partitie tafel"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Schijven"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
-msgstr "ge-encrypteerd"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
-msgstr "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
+msgstr "Repositories"
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
-msgstr "behouden"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
+msgstr "Repositories op deze server"
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Fout"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "LDAP fout"
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
-msgstr "Partitie table invoer"
-
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
-msgstr "FAI partitie table invoer"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
-msgstr "Apparaat"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
+msgstr "Poort"
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "Naam"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
-msgstr "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
-msgstr "Label"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
+msgstr "Log map"
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
-msgstr "UUID"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
-msgstr "Disk label"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
-msgstr "Partitie regels"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
-msgstr "Gecombineerd fysieke partities"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Bestand"
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Datum"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr "Beschikbare logs"
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr "Geselecteerde log"
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Fout"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr "Raid toevoegen"
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Partitietabel"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "FAI partitie tafel"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Klassenaam"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Omschrijving"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Schijven"
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,125 +392,253 @@ msgstr "Toegang"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Gelieve de gegevens te selecteren"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr "Versie"
-
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Profiel"
-
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
-msgstr "FAI profiel"
-
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
-msgstr "FAI profiel"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "FAI klassen"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: 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:306
+msgid "Unkown packages"
+msgstr "Onbekende pakketen"
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "Script"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
+msgstr "Pakket"
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
-msgstr "FAI script"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
+msgstr "FAI pakket lijst"
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Scripts"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
+msgstr "FAI pakket"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
-msgid "Variables in this class"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
-msgid "The name of the variable"
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
-msgid "A short description of the variable"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Prioriteit"
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method"
+msgstr "Installatie methode"
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:431
+msgid "Packages"
+msgstr "Pakketten"
 
-#: admin/fai/class_faiTemplate.inc:136
-#, php-format
-msgid "There are several files with the same path: %s"
+#: admin/fai/class_faiPackage.inc:435
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
-msgid "Template"
-msgstr "Sjabloon"
+#: admin/fai/class_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr "ge-encrypteerd"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
-msgid "FAI template"
-msgstr "FAI sjabloon"
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr "bootable"
 
-#: admin/fai/class_faiTemplate.inc:174
-msgid "Template class name"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr "behouden"
 
-#: admin/fai/class_faiTemplate.inc:184
-msgid "Template files"
+#: admin/fai/class_faiDiskEntry.inc:148
+#, php-format
+msgid ""
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
-msgid "Template files in this class"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
+msgstr "Partitie table invoer"
+
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
+msgstr "FAI partitie table invoer"
+
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr "Apparaat"
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "Naam"
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr "fstab key"
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr "Label"
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr "UUID"
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr "Disk label"
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr "Partitie regels"
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr "Gecombineerd fysieke partities"
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr "Aansluiting"
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr "FAI Aansluiting"
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Inhakers"
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
+msgid "Variables in this class"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+msgid "The name of the variable"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
+msgid "A short description of the variable"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Taak"
+
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
+msgstr "Script"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:151
+msgid "Template"
+msgstr "Sjabloon"
+
+#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+msgid "FAI template"
+msgstr "FAI sjabloon"
+
+#: admin/fai/class_faiTemplate.inc:174
+msgid "Template class name"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:184
+msgid "Template files"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:188
+msgid "Template files in this class"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr "Raid 0 arrays kunnen alleen worden gerealiseerd in combinatie van twee partities!"
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr "Aansluiting"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Profiel"
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr "FAI Aansluiting"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr "FAI profiel"
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Inhakers"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr "FAI profiel"
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Taak"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "FAI klassen"
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr "Beheer FAI software pakketten and deployment recepten"
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,231 +934,41 @@ msgstr "Inhoud"
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Bestand"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Datum"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr "Beschikbare logs"
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr "Geselecteerde log"
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr "FAI instellingen"
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr "FAI profiel en release om toe te passen op deze computer"
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr "FAI debian release om te installeren op deze computer"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr "Profiel"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr "FAI profiel om toe te passen op deze computer"
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr "FAI Debian repository om te gebruiken voor de installatie"
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
-msgstr "Volautomatische installatie"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
-msgstr "Repository url"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
-msgstr "Parent server"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
-msgstr "Parent repository server"
-
-#: 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 "Mirror mode"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
-msgstr "In deze mirror een installatie repository ? Is zijn uitgave aangepast ?"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
-msgstr "Lokale mirror"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
-msgstr "Is this mirror een lokale of een network mirror ?"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
-msgstr "Architectures"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
-msgstr "Processor architecturen beschikbaar op deze repository "
-
-#: 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr "Repositories"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
-msgstr "Repositories op deze server"
-
-#: 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 "Poort"
-
-#: 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 "Log map"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "FAI script"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
-msgstr ""
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Scripts"
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
-msgstr ""
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Prioriteit"
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Gelieve de gegevens te selecteren"
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr "Versie"
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
+msgstr "Filter"
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
-msgstr ""
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
+msgstr "Een maximum van 200 gegevens worden hier getoond."
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
 msgid "Update"
@@ -970,11 +977,3 @@ msgstr "Bijwerken"
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 msgstr "Verwerk"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
-msgid "A maximum of 200 entries will be shown here."
-msgstr "Een maximum van 200 gegevens worden hier getoond."
diff --git a/fai/locale/pl/fusiondirectory.po b/fai/locale/pl/fusiondirectory.po
index 288c730de2..93c8b05683 100644
--- a/fai/locale/pl/fusiondirectory.po
+++ b/fai/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,22 +17,379 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr ""
+
+#: 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/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
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Wersja"
+
+#: 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 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Repozytorium"
+
+#: 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 "URL"
+
+#: 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
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
+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/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "błąd LDAP"
+
+#: 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 "Port"
+
+#: 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 ""
+
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Plik"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Data"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Błąd"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Tablica partycji"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "Tablica partycji FAI"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Właściwości"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Nazwa klasy"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Opis"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Dyski"
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+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_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
+msgstr "Atrybuty szablonu"
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: 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 "Właściciel"
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "File owner"
+msgstr "Właściciel pliku"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "Group"
+msgstr "Grupa"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "File group"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access"
+msgstr "Dostęp"
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:166
@@ -47,20 +404,10 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "błąd LDAP"
-
 #: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
 msgid "Infrastructure service"
 msgstr ""
 
@@ -80,62 +427,15 @@ msgstr "Lista pakietów FAI"
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Właściwości"
-
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Nazwa klasy"
-
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Opis"
-
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Repozytorium"
-
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Wersja"
-
 #: 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 ""
@@ -156,36 +456,6 @@ msgstr "Pakiety"
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Tablica partycji"
-
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "Tablica partycji FAI"
-
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Dyski"
-
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
-msgstr ""
-
 #: admin/fai/class_faiDiskEntry.inc:103
 msgid "encrypted"
 msgstr ""
@@ -198,11 +468,6 @@ msgstr ""
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Błąd"
-
 #: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
@@ -222,11 +487,11 @@ msgstr ""
 msgid "Device"
 msgstr "UrzÄ…dzenie"
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "ImiÄ™"
@@ -283,151 +548,44 @@ msgid ""
 "partitions"
 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 "Atrybuty szablonu"
-
-#: 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 "Właściciel"
-
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "File owner"
-msgstr "Właściciel pliku"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "Group"
-msgstr "Grupa"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "File group"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access"
-msgstr "Dostęp"
-
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access rights"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Profile"
-
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
-msgstr "Profil FAI"
-
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "Klasy FAI"
-
-#: 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 "Ostrzeżenie"
-
-#: 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_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "Skrypt"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr "Zaczep"
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
-msgstr "Skrypt FAI"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr "Zaczep FAI"
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Skrypty"
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Zaczepy"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Priorytet"
-
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
-msgstr ""
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Zadanie"
 
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+msgid "Script"
+msgstr "Skrypt"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -540,427 +725,249 @@ msgstr "Rozmiar"
 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:275
-msgid "Missing"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Wether or not this partition can be booted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:300
-msgid "Preserve"
-msgstr "Zachowaj"
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Never"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Always"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Reinstall"
-msgstr "Przeinstaluj"
-
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:311
-msgid "The filesystem this partition should be formatted with"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext2"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext3"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr "Punkt montowania"
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr "Opcje"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr "Utwórz opcje"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:480
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr "Zaczep"
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr "Zaczep FAI"
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Zaczepy"
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Zadanie"
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:28
-msgid "Variable"
-msgstr "Zmienna"
-
-#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
-msgid "FAI variable"
-msgstr "Zmienna FAI"
-
-#: admin/fai/class_faiVariable.inc:61
-msgid "Variables"
-msgstr "Zmienie"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Plik"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Data"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
+#: admin/fai/class_faiPartition.inc:256
+msgid "Flags"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
+#: admin/fai/class_faiPartition.inc:265
+msgid "Combined physical partitions in this RAID"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize existing partition"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Bootable"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
+#: admin/fai/class_faiPartition.inc:300
+msgid "Preserve"
+msgstr "Zachowaj"
 
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Never"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Always"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Reinstall"
+msgstr "Przeinstaluj"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
+#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+msgid "Filesystem"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
+#: admin/fai/class_faiPartition.inc:311
+msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "swap space"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext2"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext3"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext4"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr ""
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
+msgstr "Punkt montowania"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
+msgstr "Opcje"
+
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
+msgstr "Utwórz opcje"
+
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
+msgstr "Opcje montowania"
+
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr "Port"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
+msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Profile"
+
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr "Profil FAI"
+
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "Klasy FAI"
+
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
+msgstr "Zmienna"
+
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
+msgstr "Zmienna FAI"
+
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
+msgstr "Zmienie"
+
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "Skrypt FAI"
+
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Skrypty"
+
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Priorytet"
+
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
+msgstr "Filtr"
+
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr "Aktualizuj"
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 msgstr "Wyślij"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtr"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
-msgid "A maximum of 200 entries will be shown here."
-msgstr ""
diff --git a/fai/locale/pt/fusiondirectory.po b/fai/locale/pt/fusiondirectory.po
index 8401959d87..b437288d8d 100644
--- a/fai/locale/pt/fusiondirectory.po
+++ b/fai/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,22 +17,379 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr ""
+
+#: 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/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
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+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 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+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
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
+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/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
+#: 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 ""
+
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Erro"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Propriedades"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Descrição"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+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_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: 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_faiPackage.inc:166
@@ -47,20 +404,10 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
 #: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
 msgid "Infrastructure service"
 msgstr ""
 
@@ -80,62 +427,15 @@ msgstr ""
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Propriedades"
-
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Descrição"
-
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: 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 ""
@@ -156,36 +456,6 @@ msgstr ""
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
-msgstr ""
-
 #: admin/fai/class_faiDiskEntry.inc:103
 msgid "encrypted"
 msgstr ""
@@ -198,11 +468,6 @@ msgstr ""
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Erro"
-
 #: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
@@ -222,11 +487,11 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nome"
@@ -283,84 +548,69 @@ msgid ""
 "partitions"
 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"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:163
-msgid "Owner and group of the file"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "Owner"
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "File owner"
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "Group"
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "File group"
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access rights"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr ""
+#: admin/fai/class_faiTemplate.inc:151
+msgid "Template"
+msgstr "Modelo"
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiTemplate.inc:174
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiTemplate.inc:184
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiTemplate.inc:188
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPackageConfiguration.inc:33
@@ -390,71 +640,6 @@ msgid ""
 "order to take effect."
 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:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
-msgid "Variables in this class"
-msgstr ""
-
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
-msgid "The name of the variable"
-msgstr ""
-
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
-msgid "A short description of the variable"
-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_faiTemplate.inc:136
-#, php-format
-msgid "There are several files with the same path: %s"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:151
-msgid "Template"
-msgstr "Modelo"
-
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
-msgid "FAI template"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:174
-msgid "Template class name"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:184
-msgid "Template files"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:188
-msgid "Template files in this class"
-msgstr ""
-
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,230 +934,40 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 msgstr "Submeter"
-
-#: 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/pt_BR/fusiondirectory.po b/fai/locale/pt_BR/fusiondirectory.po
index 977b5d99db..c0caada5c4 100644
--- a/fai/locale/pt_BR/fusiondirectory.po
+++ b/fai/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,22 +17,379 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
-msgstr "Gerencias pacotes de software FAI e receitas de implantação"
+#: 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/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
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Liberação"
+
+#: 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 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Repositório"
+
+#: 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 "URL"
+
+#: 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
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
+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 "Distribuição"
+
+#: 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/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
+#: 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 "Porta"
+
+#: 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 "Diretório de registro"
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Arquivo"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Data"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr "Registros disponíveis"
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr "Selecionar registro"
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Erro"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Tabela de partição"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "Tabela de partição FAI"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Propriedades"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Nome da classe"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Descrição"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+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_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: 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 "Proprietário"
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "File owner"
+msgstr "Dono do arquivo"
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "Group"
+msgstr "Grupo"
+
+#: 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_faiPackage.inc:166
@@ -47,20 +404,10 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
 #: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
 msgid "Infrastructure service"
 msgstr ""
 
@@ -80,62 +427,15 @@ msgstr "Lista de pacotes FAI"
 msgid "FAI Package"
 msgstr "Pacote FAI"
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Propriedades"
-
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Nome da classe"
-
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Descrição"
-
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Repositório"
-
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Liberação"
-
 #: 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 ""
@@ -156,36 +456,6 @@ msgstr "Pacotes"
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Tabela de partição"
-
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "Tabela de partição FAI"
-
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
-msgstr ""
-
 #: admin/fai/class_faiDiskEntry.inc:103
 msgid "encrypted"
 msgstr "Encriptado"
@@ -198,11 +468,6 @@ msgstr "Bootável"
 msgid "preserve"
 msgstr "preservar"
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Erro"
-
 #: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
@@ -222,11 +487,11 @@ msgstr "Entrada na tabela de partição FAI"
 msgid "Device"
 msgstr "Dispositivo"
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Nome"
@@ -283,151 +548,44 @@ msgid ""
 "partitions"
 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 "Proprietário"
-
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "File owner"
-msgstr "Dono do arquivo"
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "Group"
-msgstr "Grupo"
-
-#: 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/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Por favor, selecione as entradas desejadas"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Perfil"
-
-#: 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: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 "Aviso"
-
-#: 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."
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "Script"
-
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Script"
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Ganchos"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr ""
-
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
-msgstr ""
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Tarefa"
 
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+msgid "Script"
+msgstr "Script"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Aviso"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -533,442 +718,248 @@ msgid "Partition name"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:250
-msgid "Size"
-msgstr "Tamanho"
-
-#: admin/fai/class_faiPartition.inc:250
-msgid "Size of this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:256
-msgid "Flags"
-msgstr "Bandeiras"
-
-#: 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:275
-msgid "Missing"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Wether or not this partition can be booted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:300
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Never"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Always"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Reinstall"
-msgstr "Reinstalar"
-
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:311
-msgid "The filesystem this partition should be formatted with"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext2"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext3"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr "Ponto de montagem"
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr "Opções"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:480
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Ganchos"
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Tarefa"
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:28
-msgid "Variable"
-msgstr "Variável"
-
-#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
-msgid "FAI variable"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:61
-msgid "Variables"
-msgstr "Variáveis"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
-msgstr "Conteúdo"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Arquivo"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Data"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr "Registros disponíveis"
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr "Selecionar registro"
+msgid "Size"
+msgstr "Tamanho"
 
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size of this partition"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
+#: admin/fai/class_faiPartition.inc:256
+msgid "Flags"
+msgstr "Bandeiras"
+
+#: admin/fai/class_faiPartition.inc:265
+msgid "Combined physical partitions in this RAID"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize existing partition"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Bootable"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
+#: admin/fai/class_faiPartition.inc:300
+msgid "Preserve"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Never"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Always"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Reinstall"
+msgstr "Reinstalar"
+
+#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+msgid "Filesystem"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
+#: admin/fai/class_faiPartition.inc:311
+msgid "The filesystem this partition should be formatted with"
+msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
+#: admin/fai/class_faiPartition.inc:314
+msgid "swap space"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext2"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext3"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext4"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
+msgstr "Ponto de montagem"
+
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
-msgstr "Distribuição"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
+msgstr "Opções"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
+#: 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/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr "Porta"
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
+msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Perfil"
+
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
-msgstr "Diretório de registro"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr "Gerencias pacotes de software FAI e receitas de implantação"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
+msgstr "Variável"
+
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
+msgstr "Variáveis"
+
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
+msgstr "Conteúdo"
+
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Script"
+
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Atualizar"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Por favor, selecione as entradas desejadas"
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
@@ -978,3 +969,11 @@ msgstr "Filtro"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
+msgid "Update"
+msgstr "Atualizar"
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
+msgid "Submit"
+msgstr ""
diff --git a/fai/locale/ru/fusiondirectory.po b/fai/locale/ru/fusiondirectory.po
index 7c45319c61..e65ac4cd01 100644
--- a/fai/locale/ru/fusiondirectory.po
+++ b/fai/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,273 +17,330 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Ошибка LDAP"
-
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Свойства"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Описание"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Ошибка"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Ошибка LDAP"
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: 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/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "Фамилия"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
-msgstr "Обозначение"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr "Сортировать по убыванию"
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
-msgstr ""
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr "Сортировать по возврастанию"
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
-msgstr ""
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Файл"
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "Дата"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Ошибка"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Свойства"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Описание"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:142
 msgid "File path"
 msgstr ""
 
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Пожалуйста выберете нужные записи"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Предупреждение"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
+msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: 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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "Фамилия"
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr "Обозначение"
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Хуки"
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Приоритет"
-
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+msgid "Script"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -528,448 +713,254 @@ msgstr ""
 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:275
-msgid "Missing"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Wether or not this partition can be booted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:300
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Never"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Always"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Reinstall"
-msgstr "Переустановить"
-
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:311
-msgid "The filesystem this partition should be formatted with"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext2"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext3"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr "Точка монтирования"
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr "Параметры"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr "Создать параметры"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:480
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Хуки"
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
-msgstr ""
-
-#: 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:61
-msgid "Variables"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
-msgstr "Содержимое"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr "Сортировать по убыванию"
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr "Сортировать по возврастанию"
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Файл"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "Дата"
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
+#: admin/fai/class_faiPartition.inc:240
+msgid "Partition name"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size"
+msgstr "Размер"
+
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size of this partition"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
+#: admin/fai/class_faiPartition.inc:256
+msgid "Flags"
+msgstr "Флаги"
+
+#: admin/fai/class_faiPartition.inc:265
+msgid "Combined physical partitions in this RAID"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize existing partition"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Bootable"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
+#: admin/fai/class_faiPartition.inc:300
+msgid "Preserve"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Never"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Always"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Reinstall"
+msgstr "Переустановить"
+
+#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+msgid "Filesystem"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
+#: admin/fai/class_faiPartition.inc:311
+msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
+#: admin/fai/class_faiPartition.inc:314
+msgid "swap space"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext2"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext3"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext4"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
+msgstr "Точка монтирования"
+
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
+msgstr "Параметры"
+
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
+msgstr "Создать параметры"
+
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr "Порт"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: 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 ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
+msgstr "Содержимое"
+
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Приоритет"
+
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-msgid "Update"
-msgstr "Обновить"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Пожалуйста выберете нужные записи"
 
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-msgid "Submit"
-msgstr "Отправить"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
 msgid "Filter"
@@ -978,3 +969,11 @@ msgstr "Фильтр"
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
 msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
+msgid "Update"
+msgstr "Обновить"
+
+#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
+msgid "Submit"
+msgstr "Отправить"
diff --git a/fai/locale/ru@petr1708/fusiondirectory.po b/fai/locale/ru@petr1708/fusiondirectory.po
index 6f3bffc3b2..e55c686e30 100644
--- a/fai/locale/ru@petr1708/fusiondirectory.po
+++ b/fai/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: 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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,230 +934,40 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 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/sv/fusiondirectory.po b/fai/locale/sv/fusiondirectory.po
index fcc413bede..485823b185 100644
--- a/fai/locale/sv/fusiondirectory.po
+++ b/fai/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr "FAI-konfiguration"
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr "FusionDirectorys fai-plugin-konfiguration"
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
-msgstr "Hantera FAI-programpaket och deployment-recept"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr "FAI base RDN"
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
-msgstr ""
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
+msgstr "Avdelning där fai-avgreningar ska lagras"
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
-msgstr ""
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
+msgstr "FAI %s RDN"
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
-msgstr ""
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
+msgstr "Relativ gren där fai %s kommer att lagras"
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
-msgstr ""
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
+msgstr "er"
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
+msgstr "Fullt automatiserad installation"
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "LDAP-fel"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr "FAI-inställningar"
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
+msgstr "FAI-profil och release att applicera på den här datorn"
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
-msgstr "Okända paket"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "Release"
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
-msgstr "Paket"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr "FAI Debian release att installera på den här datorn"
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
-msgstr "FAI-paketlista"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
+msgstr "Profil"
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
-msgstr "FAI-paket"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr "FAI-profil att applicera på den här datorn"
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Egenskaper"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "Förråd"
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "Klassnamn"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
+msgstr "FAI Debian-förråd att använda för installation"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
-msgstr ""
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr "URL"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Beskrivning"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr "Förrådets url"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr ""
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr "Parent server"
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "Förråd"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr "Parent server för förråd"
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "Release"
-
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Sektioner"
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
-msgstr "Installationsmetod"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
+msgstr "Mirror-läge"
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
-msgstr ""
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
+msgstr "Är denna mirror ett installationsförråd? Är denna release skräddarsydd?"
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
-msgstr "Paket"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr "Lokal mirror"
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
-msgstr ""
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
+msgstr "Är den här mirrorn en lokal eller nätverksmirror?"
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr "Lägg till RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
+msgstr "Arkitekturer"
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr ""
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
+msgstr "Tillgängliga processorarkitekturer för det här förrådet "
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "Partitionstabell"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr "FAI-partitionstabell"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Diskar"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
-msgstr "krypterad"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
-msgstr "bootbar"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
+msgstr "Förråd"
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
-msgstr "bevara"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
+msgstr "Förråd denna server tillhandahåller"
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Fel"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "LDAP-fel"
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
-msgstr "Partitionstabellspost"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
-msgstr "FAI-partitionstabellspost"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
+msgstr "Port"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
-msgstr "Enhet"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "Namn"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
-msgstr "fstab-nyckel"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
-msgstr "Etikett"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
-msgstr "UUID"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
-msgstr "Disketikett"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
-msgstr "Partitionsposter"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Fil"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
-msgstr "Kombinerade fysiska partitioner"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Fel"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr "Lägg till RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "Partitionstabell"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr "FAI-partitionstabell"
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "Klassnamn"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Beskrivning"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Diskar"
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,126 +392,254 @@ msgstr "Tillgång"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Välj önskade poster"
-
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
-msgstr "Version"
-
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr "Profil"
-
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
-msgstr "FAI-profil"
-
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
-msgstr "FAI-profil"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "FAI-klasser"
-
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "Varning"
-
-#: 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:306
+msgid "Unkown packages"
+msgstr "Okända paket"
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "Script"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
+msgstr "Paket"
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
-msgstr "FAI-script"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
+msgstr "FAI-paketlista"
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "Script"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
+msgstr "FAI-paket"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
-msgid "Variables in this class"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
-msgid "The name of the variable"
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
-msgid "A short description of the variable"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "Prioritet"
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method"
+msgstr "Installationsmetod"
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:431
+msgid "Packages"
+msgstr "Paket"
 
-#: admin/fai/class_faiTemplate.inc:136
-#, php-format
-msgid "There are several files with the same path: %s"
+#: admin/fai/class_faiPackage.inc:435
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
-msgid "Template"
-msgstr "Mall"
+#: admin/fai/class_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr "krypterad"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
-msgid "FAI template"
-msgstr "FAI-mall"
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr "bootbar"
 
-#: admin/fai/class_faiTemplate.inc:174
-msgid "Template class name"
-msgstr ""
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr "bevara"
 
-#: admin/fai/class_faiTemplate.inc:184
-msgid "Template files"
+#: admin/fai/class_faiDiskEntry.inc:148
+#, php-format
+msgid ""
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
+msgstr "Partitionstabellspost"
+
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
+msgstr "FAI-partitionstabellspost"
+
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr "Enhet"
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "Namn"
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr "fstab-nyckel"
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr "Etikett"
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr "UUID"
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr "Disketikett"
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr "Partitionsposter"
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr "Kombinerade fysiska partitioner"
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr "Hook"
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr "FAI-hook"
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "Hooks"
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
+msgid "Variables in this class"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+msgid "The name of the variable"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
+msgid "A short description of the variable"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "Åtgärd"
+
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
+msgstr "Script"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:151
+msgid "Template"
+msgstr "Mall"
+
+#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+msgid "FAI template"
+msgstr "FAI-mall"
+
+#: admin/fai/class_faiTemplate.inc:174
+msgid "Template class name"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:184
+msgid "Template files"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:188
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "Varning"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr "Raid 0-arrayer kan bara fungera med en kombination av två partitioner!"
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr "Profil"
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr "FAI-hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr "FAI-profil"
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr "FAI-profil"
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "Åtgärd"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "FAI-klasser"
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr "Hantera FAI-programpaket och deployment-recept"
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,231 +934,41 @@ msgstr "Innehåll"
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "Fil"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr "FAI-inställningar"
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr "FAI-profil och release att applicera på den här datorn"
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr "FAI Debian release att installera på den här datorn"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr "Profil"
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr "FAI-profil att applicera på den här datorn"
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr "FAI Debian-förråd att använda för installation"
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
-msgstr "Fullt automatiserad installation"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
-msgstr "Förrådets url"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
-msgstr "Parent server"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
-msgstr "Parent server för förråd"
-
-#: 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 "Mirror-läge"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
-msgstr "Är denna mirror ett installationsförråd? Är denna release skräddarsydd?"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
-msgstr "Lokal mirror"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
-msgstr "Är den här mirrorn en lokal eller nätverksmirror?"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
-msgstr "Arkitekturer"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
-msgstr "Tillgängliga processorarkitekturer för det här förrådet "
-
-#: 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr "Förråd"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
-msgstr "Förråd denna server tillhandahåller"
-
-#: 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 "Port"
-
-#: 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/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "FAI-script"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
-msgstr ""
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Script"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr ""
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr "Prioritet"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
-msgstr "FAI-konfiguration"
-
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
-msgstr "FusionDirectorys fai-plugin-konfiguration"
-
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
-msgstr "FAI base RDN"
-
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
-msgstr "Avdelning där fai-avgreningar ska lagras"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Välj önskade poster"
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
-msgstr "FAI %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr "Version"
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
-msgstr "Relativ gren där fai %s kommer att lagras"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
+msgstr "Filter"
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
-msgstr "er"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
+msgstr "Maximalt 200 poster kommer att visas här."
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
 msgid "Update"
@@ -970,11 +977,3 @@ msgstr "Uppdatera"
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 msgstr "Skicka"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
-msgid "A maximum of 200 entries will be shown here."
-msgstr "Maximalt 200 poster kommer att visas här."
diff --git a/fai/locale/ug/fusiondirectory.po b/fai/locale/ug/fusiondirectory.po
index 3249dd2bac..fd65bd4ee5 100644
--- a/fai/locale/ug/fusiondirectory.po
+++ b/fai/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:42+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: 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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
 msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
 msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
 msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,230 +934,40 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 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/vi_VN/fusiondirectory.po b/fai/locale/vi_VN/fusiondirectory.po
index 6eeb53114c..c969f8109f 100644
--- a/fai/locale/vi_VN/fusiondirectory.po
+++ b/fai/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,22 +17,379 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr ""
+
+#: 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/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
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+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 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+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
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections"
+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/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "Lá»—i LDAP"
+
+#: 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 ""
+
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "File"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "Lá»—i"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "Properties"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "Mô tả"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+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_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: 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 "Nhóm "
+
+#: 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_faiPackage.inc:166
@@ -47,20 +404,10 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "Lá»—i LDAP"
-
 #: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
 msgid "Infrastructure service"
 msgstr ""
 
@@ -80,62 +427,15 @@ msgstr ""
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "Properties"
-
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "Mô tả"
-
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: 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 ""
@@ -156,36 +456,6 @@ msgstr ""
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
-msgstr ""
-
 #: admin/fai/class_faiDiskEntry.inc:103
 msgid "encrypted"
 msgstr ""
@@ -198,11 +468,6 @@ msgstr ""
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "Lá»—i"
-
 #: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
@@ -222,11 +487,11 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
 msgid "Name"
 msgstr "Tên"
@@ -283,84 +548,69 @@ msgid ""
 "partitions"
 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"
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:159
-msgid "Content of the template file"
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:163
-msgid "Owner and group of the file"
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "Owner"
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:166
-msgid "File owner"
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "Group"
-msgstr "Nhóm "
-
-#: admin/fai/class_faiTemplateEntry.inc:171
-msgid "File group"
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access"
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:180
-msgid "Access rights"
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
+#: admin/fai/class_faiScript.inc:84
+msgid "Script"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
-msgstr ""
+#: admin/fai/class_faiTemplate.inc:151
+msgid "Template"
+msgstr "Mẫu"
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiTemplate.inc:174
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
+#: admin/fai/class_faiTemplate.inc:184
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiTemplate.inc:188
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPackageConfiguration.inc:33
@@ -390,71 +640,6 @@ msgid ""
 "order to take effect."
 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:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
-msgid "Variables in this class"
-msgstr ""
-
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
-msgid "The name of the variable"
-msgstr ""
-
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
-msgid "A short description of the variable"
-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_faiTemplate.inc:136
-#, php-format
-msgid "There are several files with the same path: %s"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:151
-msgid "Template"
-msgstr "Mẫu"
-
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
-msgid "FAI template"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:174
-msgid "Template class name"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:184
-msgid "Template files"
-msgstr ""
-
-#: admin/fai/class_faiTemplate.inc:188
-msgid "Template files in this class"
-msgstr ""
-
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -697,24 +882,36 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:28
@@ -737,230 +934,40 @@ msgstr ""
 msgid "The content of the variable"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "File"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
-msgstr ""
-
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated 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:155
-msgid "Package repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-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"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr ""
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 msgstr "Ná»™p"
-
-#: 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/zh/fusiondirectory.po b/fai/locale/zh/fusiondirectory.po
index a35c3c11d6..7a1f784cf4 100644
--- a/fai/locale/zh/fusiondirectory.po
+++ b/fai/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,270 +17,327 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/systems/class_faiStartup.inc:147 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "自动化安装"
 
-#: admin/fai/class_faiManagement.inc:118
-msgid "Manage FAI software packages and deployment recipes"
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:138
-msgid "There are no FAI branches"
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:141
-msgid " Please add at least one repository service to create those."
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:166
-msgid "Mark for installation"
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:170
-msgid "Mark for removal"
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:175
-msgid "Edit configuration"
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:256
-#: admin/fai/class_faiPartitionTable.inc:209
-#: admin/fai/class_faiPartitionTable.inc:250
-#: admin/fai/class_faiTemplate.inc:114
-#: admin/systems/services/repository/class_serviceRepository.inc:231
-#: admin/systems/services/repository/class_serviceRepository.inc:248
-#: admin/systems/services/repository/class_serviceRepository.inc:252
-msgid "LDAP error"
-msgstr "LDAP 错误"
-
-#: admin/fai/class_faiPackage.inc:288
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:59
-msgid "Infrastructure service"
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:306
-msgid "Unkown packages"
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:376
-msgid "Package"
-msgstr "软件包"
+#: admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+#: admin/fai/class_faiPackage.inc:412
+msgid "Release"
+msgstr "发行"
 
-#: admin/fai/class_faiPackage.inc:377
-msgid "FAI Package list"
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:380
-msgid "FAI Package"
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:396
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiProfile.inc:49
-#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:171
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiVariable.inc:48
-msgid "Properties"
-msgstr "属性"
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:399
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:174
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Class name"
-msgstr "类名"
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
+msgid "Repository"
+msgstr "仓库"
 
-#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiScript.inc:53
-#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiVariable.inc:51
-msgid "Variables class name"
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310
-#: admin/fai/class_faiDiskEntry.inc:241
-#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
-#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiPartition.inc:246
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-msgid "Description"
-msgstr "描述"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr "URL"
 
-#: admin/fai/class_faiPackage.inc:403
-#: admin/fai/class_faiPartitionTable.inc:310 admin/fai/class_faiProfile.inc:56
-#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:178
-#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiVariable.inc:55
-msgid "Short description of the class"
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:88
-msgid "Repository"
-msgstr "仓库"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:76
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release"
-msgstr "发行"
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:412
-msgid "Debian release concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
 #: admin/systems/services/repository/class_serviceRepository.inc:47
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:416
-msgid "Sections concerned"
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method"
-msgstr "安装方法"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:420
-msgid "Install method to use for this package list"
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:431
-msgid "Packages"
-msgstr "软件包"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:435
-msgid "Packages in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:115
-msgid "Add LVM"
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
-msgid "Partition table"
-msgstr "分区表"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
-msgid "FAI partition table"
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
-msgid "Partition table class name"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:316
-msgid "Discs"
-msgstr "Discs"
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
-msgid "Partitions in this class"
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
-msgid "encrypted"
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
-msgid "bootable"
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
-msgid "preserve"
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:147 admin/systems/class_faiLogView.inc:203
-#: admin/systems/class_faiLogView.inc:238
-msgid "Error"
-msgstr "错误"
+#: admin/systems/services/repository/class_serviceRepository.inc:236
+#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiPackage.inc:256 admin/fai/class_faiTemplate.inc:114
+msgid "LDAP error"
+msgstr "LDAP 错误"
 
-#: admin/fai/class_faiDiskEntry.inc:148
-#, php-format
-msgid ""
-"The partition cannot be deleted while it is used in the \"%s\" disk "
-"definition!"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
-msgid "Partition table entry"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
-msgid "FAI partition table entry"
+#: 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/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
-msgid "Device"
-msgstr "设备"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiPartition.inc:240
-#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
-#: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-msgid "Name"
-msgstr "名称"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
-msgid "Disk name"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
-msgid "Short description"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "fstab key"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
-msgid "Key to use in fstab file"
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "Label"
+#: admin/systems/class_faiLogView.inc:56
+msgid "Sort down"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
-msgid "UUID"
+#: admin/systems/class_faiLogView.inc:58
+msgid "Sort up"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
-msgid "Disk label"
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "文件"
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "Date"
+msgstr "日期"
+
+#: admin/systems/class_faiLogView.inc:150
+#: admin/systems/class_faiLogView.inc:153
+msgid "Available logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
-msgid "Partition entries"
-msgstr "分区条目"
+#: admin/systems/class_faiLogView.inc:158
+msgid "Selected log"
+msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
-msgid "Combined physical partitions"
+#: admin/systems/class_faiLogView.inc:162
+msgid "Content of the selected log"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
-msgid "Physical partitions combined in this LVM volume"
+#: admin/systems/class_faiLogView.inc:174
+msgid "FAI Logs"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
-msgid ""
-"You have more than four primary partition table entries in your "
-"configuration"
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs Viewer"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
-msgid ""
-"You cannot have more than three primary partition while using logical "
-"partitions"
+#: admin/systems/class_faiLogView.inc:203
+#: admin/systems/class_faiLogView.inc:238 admin/fai/class_faiDiskEntry.inc:147
+msgid "Error"
+msgstr "错误"
+
+#: admin/systems/class_faiLogView.inc:218
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:226
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:111
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:283
+msgid "Partition table"
+msgstr "分区表"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+#: admin/fai/class_faiPartitionTable.inc:287
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:303
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
+#: admin/fai/class_faiScript.inc:50
+msgid "Properties"
+msgstr "属性"
+
+#: admin/fai/class_faiPartitionTable.inc:306
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:174 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Class name"
+msgstr "类名"
+
+#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:178
+#: admin/fai/class_faiPartition.inc:246 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+msgid "Description"
+msgstr "描述"
+
+#: admin/fai/class_faiPartitionTable.inc:310
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:178 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:316
+msgid "Discs"
+msgstr "Discs"
+
+#: admin/fai/class_faiPartitionTable.inc:323
+#: admin/fai/class_faiDiskEntry.inc:271
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:142
@@ -335,99 +392,200 @@ msgstr "访问"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:10
-msgid "Please select the desired entries"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/packageSelect/selectPackage-list.xml:48
-msgid "Version"
+#: admin/fai/class_faiPackage.inc:170
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:30
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:175
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:31
-msgid "FAI profile"
+#: admin/fai/class_faiPackage.inc:288
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:34
-msgid "FAI Profile"
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes"
-msgstr "自动化安装(FAI)类"
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
+msgstr "软件包"
 
-#: admin/fai/class_faiProfile.inc:63
-msgid "FAI classes which are part of this profile"
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:33
-#: admin/fai/class_faiPackageConfiguration.inc:36
-msgid "FAI package configuration"
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:34
-msgid "Configure debconf options of a package"
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:80
-#, php-format
-msgid "Debconf information for package \"%s\""
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:172
-msgid "Warning"
-msgstr "警告"
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
+msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:173
+#: 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_faiDiskEntry.inc:103
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:106
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:109
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:148
 #, php-format
 msgid ""
-"The debconf questions \"%s\" are dynamically generated during package "
-"installation and requires choosing between specific options which cannot be "
-"presented here. The entered text needs to be one of the valid choices in "
-"order to take effect."
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
-#: admin/fai/class_faiHook.inc:85
-msgid "Script"
-msgstr "脚本"
+#: admin/fai/class_faiDiskEntry.inc:220
+msgid "Partition table entry"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
-msgid "FAI script"
+#: admin/fai/class_faiDiskEntry.inc:221
+msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:63
-msgid "Scripts"
-msgstr "脚本"
+#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+msgid "Device"
+msgstr "设备"
 
-#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:65
-#: admin/fai/class_faiVariable.inc:65
-msgid "Variables in this class"
+#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr "名称"
+
+#: admin/fai/class_faiDiskEntry.inc:235
+msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:69
-#: admin/fai/class_faiVariable.inc:69
-msgid "The name of the variable"
+#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:73
-#: admin/fai/class_faiVariable.inc:73
-msgid "A short description of the variable"
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority"
-msgstr "优先级"
+#: admin/fai/class_faiDiskEntry.inc:245
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:248
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:260
+msgid "Partition entries"
+msgstr "分区条目"
+
+#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:265
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:540
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:544
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr "钩子"
+
+#: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
+#: admin/fai/class_faiScript.inc:67
+msgid "Variables in this class"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:69 admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiScript.inc:71
+msgid "The name of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:79
-msgid "Priority of this script (smaller is done first)"
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiScript.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr "任务"
+
+#: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
-msgid "The script itself"
+msgid "Script"
+msgstr "脚本"
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:136
@@ -455,6 +613,33 @@ msgstr ""
 msgid "Template files in this class"
 msgstr ""
 
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr "警告"
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
 msgstr ""
@@ -538,429 +723,251 @@ 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:275
-msgid "Missing"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:292
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:296
-msgid "Wether or not this partition can be booted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:300
-msgid "Preserve"
-msgstr "保留"
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Never"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Always"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:303
-msgid "Reinstall"
-msgstr "重新安装"
-
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:311
-msgid "The filesystem this partition should be formatted with"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext2"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext3"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "ext4"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "reiser fs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "xfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-msgid "btrfs"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:314
-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
-msgid "Mount point"
-msgstr "挂载点"
-
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
-msgstr "选项"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
-msgstr "创建选项"
-
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:334
-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
-msgid "RAID 0"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:381
-msgid "RAID 1"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:382
-msgid "RAID 5"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:383
-msgid "RAID 6"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:478
-msgid "Raid arrays must contain at least two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:480
-msgid ""
-"Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:28
-msgid "Hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
-msgid "FAI hook"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:61
-msgid "Hooks"
-msgstr "钩子"
-
-#: admin/fai/class_faiHook.inc:77
-msgid "Task"
-msgstr "任务"
-
-#: admin/fai/class_faiHook.inc:85
-msgid "The script of this hook"
-msgstr ""
-
-#: 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:61
-msgid "Variables"
-msgstr "变量"
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "Content"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:77
-msgid "The content of the variable"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:56
-msgid "Sort down"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:58
-msgid "Sort up"
-msgstr ""
-
-#: admin/systems/class_faiLogView.inc:70
-msgid "File"
-msgstr "文件"
-
-#: admin/systems/class_faiLogView.inc:71
-msgid "Date"
-msgstr "日期"
+msgstr ""
 
-#: admin/systems/class_faiLogView.inc:150
-#: admin/systems/class_faiLogView.inc:153
-msgid "Available logs"
+#: admin/fai/class_faiPartition.inc:256
+msgid "Flags"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:158
-msgid "Selected log"
+#: admin/fai/class_faiPartition.inc:265
+msgid "Combined physical partitions in this RAID"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:162
-msgid "Content of the selected log"
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:174
-msgid "FAI Logs"
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:175
-msgid "FAI Logs Viewer"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:218
-msgid "Selected file"
+#: admin/fai/class_faiPartition.inc:292
+msgid "Resize existing partition"
 msgstr ""
 
-#: admin/systems/class_faiLogView.inc:226
-#, php-format
-msgid "Selected file: %s"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Bootable"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:68
-msgid "FAI settings"
+#: admin/fai/class_faiPartition.inc:296
+msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:72
-msgid "FAI profil and release to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:300
+msgid "Preserve"
+msgstr "保留"
+
+#: admin/fai/class_faiPartition.inc:303
+msgid "Never"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:76
-msgid "FAI debian release to be installed on this computer"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Always"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "Profil"
+#: admin/fai/class_faiPartition.inc:303
+msgid "Reinstall"
+msgstr "重新安装"
+
+#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+msgid "Filesystem"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:80
-msgid "FAI profil to be applied to this computer"
+#: admin/fai/class_faiPartition.inc:311
+msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:88
-msgid "FAI Debian repository to be used for installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "swap space"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:148
-msgid "Full automated installation"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext2"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "URL"
-msgstr "URL"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext3"
+msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
-msgid "Repository url"
+#: admin/fai/class_faiPartition.inc:314
+msgid "ext4"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "reiser fs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
-msgid "Parent repository server"
+#: admin/fai/class_faiPartition.inc:314
+msgid "xfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/fai/class_faiPartition.inc:314
+msgid "btrfs"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/fai/class_faiPartition.inc:314
+msgid "LVM/RAID"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid "Mirror mode"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
-msgid ""
-"Is this mirror an installation repository? Is its release a custom one?"
+#: admin/fai/class_faiPartition.inc:317
+msgid "Wether or not this partition is encrypted"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Local mirror"
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point"
+msgstr "挂载点"
+
+#: admin/fai/class_faiPartition.inc:321
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
-msgid "Is this mirror a local or a network mirror?"
+#: admin/fai/class_faiPartition.inc:327
+msgid "Options"
+msgstr "选项"
+
+#: admin/fai/class_faiPartition.inc:330
+msgid "Create options"
+msgstr "创建选项"
+
+#: admin/fai/class_faiPartition.inc:330
+msgid "Filesystem create options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Architectures"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
-msgid "Processor architectures available on this repository"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
+#: admin/fai/class_faiPartition.inc:338
+msgid "Mount options"
+msgstr "挂载选项"
+
+#: admin/fai/class_faiPartition.inc:338
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
+#: admin/fai/class_faiPartition.inc:380
+msgid "RAID 0"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "Path pattern"
+#: admin/fai/class_faiPartition.inc:381
+msgid "RAID 1"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:77
-msgid "How this repository is organized (only for RPM repositories)"
+#: admin/fai/class_faiPartition.inc:382
+msgid "RAID 5"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:155
-msgid "Package repository"
+#: admin/fai/class_faiPartition.inc:383
+msgid "RAID 6"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:156
-msgid "Package repository information"
+#: admin/fai/class_faiPartition.inc:478
+msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:168
-msgid "Repositories"
+#: admin/fai/class_faiPartition.inc:480
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:173
-msgid "Repositories this server hosts"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
-msgid "Argonaut FAI monitor"
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
-msgid "Argonaut FAI monitor settings"
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "Port"
-msgstr "端口"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr "自动化安装(FAI)类"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
-msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "Timeout"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
-msgid "The timeout for bad clients. 0 to disable."
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "CA certificate"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
-msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
+msgstr "变量"
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Log directory"
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
 msgstr ""
 
-#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
-msgid "Directory in which argonaut-fai-monitor will store its log"
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
+msgstr "变量"
+
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:28
-msgid "FAI configuration"
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:29
-msgid "FusionDirectory fai plugin configuration"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Fai base RDN"
+#: 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 ""
 
-#: config/fai/class_faiConfig.inc:44
-msgid "Branch in which fai branches will be stored"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:59
-#, php-format
-msgid "Fai %s RDN"
+#: admin/fai/packageSelect/selectPackage-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-#, php-format
-msgid "Relative branch in which fai %s will be stored"
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
 msgstr ""
 
-#: config/fai/class_faiConfig.inc:60
-msgid "s"
+#: 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 ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
@@ -970,11 +977,3 @@ msgstr "æ›´æ–°"
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
 msgid "Submit"
 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/ar/fusiondirectory.po b/freeradius/locale/ar/fusiondirectory.po
index 9f60aa1e68..45940818fa 100644
--- a/freeradius/locale/ar/fusiondirectory.po
+++ b/freeradius/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,48 +17,48 @@ 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/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/ca/fusiondirectory.po b/freeradius/locale/ca/fusiondirectory.po
index c86ddcf6ee..c5e7ba1eb7 100644
--- a/freeradius/locale/ca/fusiondirectory.po
+++ b/freeradius/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/cs_CZ/fusiondirectory.po b/freeradius/locale/cs_CZ/fusiondirectory.po
index dfe829abf3..8fdf7215bc 100644
--- a/freeradius/locale/cs_CZ/fusiondirectory.po
+++ b/freeradius/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr "Freeradius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Tento zásuvný modul slouží pro správu ověřování Radius, založeném na implementaci FreeRadius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "Podpora 802.1x"
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr "Typ média tunelu"
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr "Název typu média tunelu"
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Typ tunelu"
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Název typu tunelu"
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "Identifikátor virtuální sítě (vlan)"
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Identifikátor virt. sítě (vlan)"
 
diff --git a/freeradius/locale/de/fusiondirectory.po b/freeradius/locale/de/fusiondirectory.po
index 56554e9727..8f6c243b2f 100644
--- a/freeradius/locale/de/fusiondirectory.po
+++ b/freeradius/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr "Freeradius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Dieses Plugin dient für Radiusaufzeichungen basierend auf FreeRadius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "Unterstützung von 802.1x"
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr "Art des Tunnelmediums"
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr "Name der Tunnelmediumart"
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Tunelart"
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Name der Tunnelart"
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "VLAN id"
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "VLAN identifier"
 
diff --git a/freeradius/locale/el_GR/fusiondirectory.po b/freeradius/locale/el_GR/fusiondirectory.po
index 2a8fa0aa57..39aa7ffd4f 100644
--- a/freeradius/locale/el_GR/fusiondirectory.po
+++ b/freeradius/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,48 +18,48 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr "Freeradius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Αυτό το πρόσθετο είναι για το Radius accounting based in FreeRadius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "Υποστήριξη 802.1x"
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr "Είδος μέσου Tunnel "
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr "Όνομα του είδους μέσου Tunnel "
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Τύπος Tunnel "
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Όνομα του tunnel type"
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "VLAN id"
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Αναγνωριστικό VLAN"
 
diff --git a/freeradius/locale/es/fusiondirectory.po b/freeradius/locale/es/fusiondirectory.po
index 36bd70e078..a6341a98f4 100644
--- a/freeradius/locale/es/fusiondirectory.po
+++ b/freeradius/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/es_CO/fusiondirectory.po b/freeradius/locale/es_CO/fusiondirectory.po
index 322d3927f3..62feb57ae8 100644
--- a/freeradius/locale/es_CO/fusiondirectory.po
+++ b/freeradius/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/es_VE/fusiondirectory.po b/freeradius/locale/es_VE/fusiondirectory.po
index 01303c7d7d..eac687a405 100644
--- a/freeradius/locale/es_VE/fusiondirectory.po
+++ b/freeradius/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/fa_IR/fusiondirectory.po b/freeradius/locale/fa_IR/fusiondirectory.po
index db60359eb9..cd260dbcf9 100644
--- a/freeradius/locale/fa_IR/fusiondirectory.po
+++ b/freeradius/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/fi_FI/fusiondirectory.po b/freeradius/locale/fi_FI/fusiondirectory.po
index 7b40df4077..5be620895c 100644
--- a/freeradius/locale/fi_FI/fusiondirectory.po
+++ b/freeradius/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/fr/fusiondirectory.po b/freeradius/locale/fr/fusiondirectory.po
index 22d9fe1b67..961482478b 100644
--- a/freeradius/locale/fr/fusiondirectory.po
+++ b/freeradius/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,48 +18,48 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr "Freeradius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Ce plugin est pour la comptabilité Radius basé sur FreeRadius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "Supporter 802.1x"
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr "Type de média pour le tunnel"
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr "Nom du type de média pour le tunnel"
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Type de tunnel"
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Nom du type de tunnel"
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "ID du Vlan"
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Identifiant du Vlan"
 
diff --git a/freeradius/locale/hu_HU/fusiondirectory.po b/freeradius/locale/hu_HU/fusiondirectory.po
index 3598c3df9b..798b8e92f0 100644
--- a/freeradius/locale/hu_HU/fusiondirectory.po
+++ b/freeradius/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/id/fusiondirectory.po b/freeradius/locale/id/fusiondirectory.po
index 723d1f7742..b5859852ef 100644
--- a/freeradius/locale/id/fusiondirectory.po
+++ b/freeradius/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/it_IT/fusiondirectory.po b/freeradius/locale/it_IT/fusiondirectory.po
index 342d1067d2..46498cc5e1 100644
--- a/freeradius/locale/it_IT/fusiondirectory.po
+++ b/freeradius/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,48 +19,48 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr "Freeradius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Questo plugin è per l'accounting RADIUS basato su FreeRadius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "Supporto 802.1x"
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr "Tunnel di tipo medio"
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr "Nome del tunnel di tipo medio"
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Tipo di tunnel"
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Nome del tipo di tunnel"
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "ID della VLAN"
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Identificatore della VLAN"
 
diff --git a/freeradius/locale/lv/fusiondirectory.po b/freeradius/locale/lv/fusiondirectory.po
index ac265776f3..69169871e9 100644
--- a/freeradius/locale/lv/fusiondirectory.po
+++ b/freeradius/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/nb/fusiondirectory.po b/freeradius/locale/nb/fusiondirectory.po
index 88fd182383..55b8ab03cf 100644
--- a/freeradius/locale/nb/fusiondirectory.po
+++ b/freeradius/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/nl/fusiondirectory.po b/freeradius/locale/nl/fusiondirectory.po
index 50cfa2de19..b433e72028 100644
--- a/freeradius/locale/nl/fusiondirectory.po
+++ b/freeradius/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr "Freeradius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Deze plugin is voor Radius accouting gebaseerd in Freeradius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/pl/fusiondirectory.po b/freeradius/locale/pl/fusiondirectory.po
index 67082e1eb6..cfbfdb8699 100644
--- a/freeradius/locale/pl/fusiondirectory.po
+++ b/freeradius/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/pt/fusiondirectory.po b/freeradius/locale/pt/fusiondirectory.po
index aa81ba1aaa..e4d378f2eb 100644
--- a/freeradius/locale/pt/fusiondirectory.po
+++ b/freeradius/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/pt_BR/fusiondirectory.po b/freeradius/locale/pt_BR/fusiondirectory.po
index e218cee8e0..c15206bdc9 100644
--- a/freeradius/locale/pt_BR/fusiondirectory.po
+++ b/freeradius/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr "Freeradius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr "Este Plugin é para uma conta Radius baseado em FreeRadius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Tipo de túnel"
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Nome do tipo de túnel"
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "id de VLAN"
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Indentificador da VLAN"
 
diff --git a/freeradius/locale/ru/fusiondirectory.po b/freeradius/locale/ru/fusiondirectory.po
index d7955698fc..0bdc6ba98f 100644
--- a/freeradius/locale/ru/fusiondirectory.po
+++ b/freeradius/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:07+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -18,48 +18,48 @@ 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/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr "Freeradius"
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "Поддержка 802.1x"
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Тип туннеля"
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Название типа туннеля"
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "VLAN id"
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Идентификатор VLAN"
 
diff --git a/freeradius/locale/ru@petr1708/fusiondirectory.po b/freeradius/locale/ru@petr1708/fusiondirectory.po
index 96e600ee66..112fef1262 100644
--- a/freeradius/locale/ru@petr1708/fusiondirectory.po
+++ b/freeradius/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,48 +17,48 @@ 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/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/sv/fusiondirectory.po b/freeradius/locale/sv/fusiondirectory.po
index dfac8d094c..f30d61723a 100644
--- a/freeradius/locale/sv/fusiondirectory.po
+++ b/freeradius/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/ug/fusiondirectory.po b/freeradius/locale/ug/fusiondirectory.po
index 480a6dca6d..9665dd61a9 100644
--- a/freeradius/locale/ug/fusiondirectory.po
+++ b/freeradius/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/vi_VN/fusiondirectory.po b/freeradius/locale/vi_VN/fusiondirectory.po
index 5fafe8c236..e47dd03b5d 100644
--- a/freeradius/locale/vi_VN/fusiondirectory.po
+++ b/freeradius/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/freeradius/locale/zh/fusiondirectory.po b/freeradius/locale/zh/fusiondirectory.po
index 470f01d057..fb56b03377 100644
--- a/freeradius/locale/zh/fusiondirectory.po
+++ b/freeradius/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:43+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
+#: admin/freeradius/class_freeradiusGroup.inc:34
 msgid "Freeradius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:35
 #: personal/freeradius/class_freeradiusAccount.inc:36
+#: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:49
 #: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:52
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:53
 #: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:59
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:66
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: admin/freeradius/class_freeradiusGroup.inc:67
 #: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
diff --git a/fusioninventory/locale/ar/fusiondirectory.po b/fusioninventory/locale/ar/fusiondirectory.po
index f05e909184..d07a1790a6 100644
--- a/fusioninventory/locale/ar/fusiondirectory.po
+++ b/fusioninventory/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/ca/fusiondirectory.po b/fusioninventory/locale/ca/fusiondirectory.po
index 44939a8820..f36764b636 100644
--- a/fusioninventory/locale/ca/fusiondirectory.po
+++ b/fusioninventory/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr "La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/cs_CZ/fusiondirectory.po b/fusioninventory/locale/cs_CZ/fusiondirectory.po
index 67858f61e1..f8be47729c 100644
--- a/fusioninventory/locale/cs_CZ/fusiondirectory.po
+++ b/fusioninventory/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr "Nastavení FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr "Nastavení zásuvného modulu FusionInventory pro FusionDirectory"
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr "FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr "Relativní rozlišený název inventáře"
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr "Větev, ve které budou ukládány objekty inventáře"
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr "Párování inventáře"
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr "Hlediska pro přiřazení výsledku inventury k systému"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr "MAC adresa"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "IP adresa"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr "Obojí"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr "IP či MAC adresa"
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr "Nastavení %s/%s FusionDirectory není čitelné. Akce byla zrušena."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr "BEZ POPISKU"
@@ -54,35 +104,6 @@ msgstr "Objekty inventáře"
 msgid "Browse inventory objects"
 msgstr "Procházet objekty inventáře"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr "Inventář"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr "Prohlížeč inventáře"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr "Objekt inventáře"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr "Hardware"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr "Programové vybavení"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Uživatelé"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr "Procesy"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Nastavení"
@@ -140,56 +161,35 @@ msgstr "Důvěra"
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr "IP adresy počítačů, ze kterých je možné spouštět úkony inventarizace z webového rozhraní"
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr "FusionInventory"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr "Nastavení agenta FusionInventory"
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "Nastavení %s/%s FusionDirectory není čitelné. Akce byla zrušena."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr "Nastavení FusionInventory"
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr "Nastavení zásuvného modulu FusionInventory pro FusionDirectory"
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr "Relativní rozlišený název inventáře"
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
-msgstr "Větev, ve které budou ukládány objekty inventáře"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
+msgstr "Inventář"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
-msgstr "Párování inventáře"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
+msgstr "Prohlížeč inventáře"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
-msgstr "Hlediska pro přiřazení výsledku inventury k systému"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
+msgstr "Objekt inventáře"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
-msgstr "MAC adresa"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
+msgstr "Hardware"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "IP adresa"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
+msgstr "Programové vybavení"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr "Obojí"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Uživatelé"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
-msgstr "IP či MAC adresa"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
+msgstr "Procesy"
diff --git a/fusioninventory/locale/de/fusiondirectory.po b/fusioninventory/locale/de/fusiondirectory.po
index a935e73e45..1ef6facd13 100644
--- a/fusioninventory/locale/de/fusiondirectory.po
+++ b/fusioninventory/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr "FusionInventory-Konfiguration"
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr "FusionInventory"
+
+#: 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 "MAC-Adresse"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "IP-Adresse"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr "Beide"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr "IP- oder MAC-Adresse"
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr "KEIN LABEL"
@@ -54,35 +104,6 @@ msgstr "Inventarobjekte"
 msgid "Browse inventory objects"
 msgstr "Inventarobjekte durchsuchen"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr "Inventar"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr "Inventarbetrachter"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr "Inventarobjekt"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr "Hardware"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr "Software"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Benutzer"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Konfiguration"
@@ -140,56 +161,35 @@ msgstr "Vertrauen"
 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 "FusionInventory"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr "FusionInventory-Agentkonfiguration"
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
+msgstr "Inventar"
 
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr "FusionInventory-Konfiguration"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
+msgstr "Inventarbetrachter"
 
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
+msgstr "Inventarobjekt"
 
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
+msgstr "Hardware"
 
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
+msgstr "Software"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Benutzer"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
-msgstr "MAC-Adresse"
-
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "IP-Adresse"
-
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr "Beide"
-
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
-msgstr "IP- oder MAC-Adresse"
diff --git a/fusioninventory/locale/el_GR/fusiondirectory.po b/fusioninventory/locale/el_GR/fusiondirectory.po
index 530333d774..3c74b74912 100644
--- a/fusioninventory/locale/el_GR/fusiondirectory.po
+++ b/fusioninventory/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,56 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr "Ρύθμιση FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr "FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr "Απογραφή RDN"
+
+#: 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 "Διεύθυνση Mac "
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "Διεύθυνση IP"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr "Και τα δύο"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr "Διεύθυνση IP ή Mac address"
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr "Οι ρυθμίσεις FusionDirectory %s/%s  δεν είναι αναγνώσιμες. Ακύρωση."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr "ΧΩΡΙΣ ΕΤΙΚΕΤΑ"
@@ -55,35 +105,6 @@ msgstr "Αντικείμενα απογραφής"
 msgid "Browse inventory objects"
 msgstr "Περιήγηση αντικειμένων απογραφής"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr "Απογραφή"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr "Προβολή απογραφής"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr "Αντικείμενο απογραφής"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr "Υλικό"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr "Λογισμικό"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Χρήστες"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr "Διεργασίες"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Διαμόρφωση"
@@ -141,56 +162,35 @@ msgstr "Εμπιστοσύνη"
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr "Οι επιτρεπόμενες IPs που μπορούν να εκκινήσουν εργασία απογραφής μέσω web interface"
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr "FusionInventory"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr "Ρύθμιση FusionInventory agent"
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "Οι ρυθμίσεις FusionDirectory %s/%s  δεν είναι αναγνώσιμες. Ακύρωση."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr "Ρύθμιση FusionInventory"
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory FusionInventory"
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr "Απογραφή RDN"
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
-msgstr "Κλάδος στον οποίο θα αποθηκεύονται τα αντικείμενα της απογραφής"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
+msgstr "Απογραφή"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
-msgstr "Ταίριασμα απογραφής"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
+msgstr "Προβολή απογραφής"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
-msgstr "Κριτήρια σύνδεσης ενός αποτελέσματος απογραφής με το σύστημα"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
+msgstr "Αντικείμενο απογραφής"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
-msgstr "Διεύθυνση Mac "
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
+msgstr "Υλικό"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "Διεύθυνση IP"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
+msgstr "Λογισμικό"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr "Και τα δύο"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Χρήστες"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
-msgstr "Διεύθυνση IP ή Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
+msgstr "Διεργασίες"
diff --git a/fusioninventory/locale/es/fusiondirectory.po b/fusioninventory/locale/es/fusiondirectory.po
index d0b804ea03..b9be6e4daf 100644
--- a/fusioninventory/locale/es/fusiondirectory.po
+++ b/fusioninventory/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "Dirección IP"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr "Hardware"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr "Software"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Usuarios"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Configuración"
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
+msgstr "Hardware"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "Dirección IP"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
+msgstr "Software"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Usuarios"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/es_CO/fusiondirectory.po b/fusioninventory/locale/es_CO/fusiondirectory.po
index fd85a17c43..96bf4d9c59 100644
--- a/fusioninventory/locale/es_CO/fusiondirectory.po
+++ b/fusioninventory/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, 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."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr "SIN ETIQUETA"
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Usuarios"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Configuración"
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuración %s/%s de FusionDirectory no tiene permisos de lectura. Abortado."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Usuarios"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/es_VE/fusiondirectory.po b/fusioninventory/locale/es_VE/fusiondirectory.po
index f6a0f98b11..0585535aa9 100644
--- a/fusioninventory/locale/es_VE/fusiondirectory.po
+++ b/fusioninventory/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "Dirección IP"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr "Hardware"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr "Software"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Usuarios"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Configuración"
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
+msgstr "Hardware"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "Dirección IP"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
+msgstr "Software"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Usuarios"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/fa_IR/fusiondirectory.po b/fusioninventory/locale/fa_IR/fusiondirectory.po
index 8c3c53121a..9310bc2b9a 100644
--- a/fusioninventory/locale/fa_IR/fusiondirectory.po
+++ b/fusioninventory/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/fi_FI/fusiondirectory.po b/fusioninventory/locale/fi_FI/fusiondirectory.po
index ee0c4a1a92..4c023be43c 100644
--- a/fusioninventory/locale/fi_FI/fusiondirectory.po
+++ b/fusioninventory/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/fr/fusiondirectory.po b/fusioninventory/locale/fr/fusiondirectory.po
index c4692c7274..9f43acc68d 100644
--- a/fusioninventory/locale/fr/fusiondirectory.po
+++ b/fusioninventory/locale/fr/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -20,6 +20,56 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr "Configuration FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr "Configuration du plugin FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr "FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr "Branche des inventaires"
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr "Branche où seront stockés les objets d’inventaire"
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr "Critère de correspondance "
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr "Critère pour lier un inventaire à un système"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr "Adresse mac"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "Adresse IP"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr "Les deux"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr "Adresse IP ou Mac"
+
+#: html/collect.php:78
+#, 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."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr "SANS TITRE"
@@ -57,35 +107,6 @@ msgstr "Objets d'inventaire"
 msgid "Browse inventory objects"
 msgstr "Parcourir les objets d'inventaire"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr "Inventaire"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr "Affichage de l'inventaire"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr "Objet d'inventaire"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr "Matériel"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr "Logiciel"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Utilisateurs"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr "Processus"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Configuration"
@@ -143,56 +164,35 @@ msgstr "Mode de confiance"
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr "IPs autorisées à lancer des tâches d'inventaire via l'interface web"
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr "FusionInventory"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr "Configuration de l'agent FusionInventory"
 
-#: html/collect.php:78
-#, 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."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr "Configuration FusionInventory"
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr "Configuration du plugin FusionInventory"
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr "Branche des inventaires"
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
-msgstr "Branche où seront stockés les objets d’inventaire"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
+msgstr "Inventaire"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
-msgstr "Critère de correspondance "
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
+msgstr "Affichage de l'inventaire"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
-msgstr "Critère pour lier un inventaire à un système"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
+msgstr "Objet d'inventaire"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
-msgstr "Adresse mac"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
+msgstr "Matériel"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "Adresse IP"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
+msgstr "Logiciel"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr "Les deux"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Utilisateurs"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
-msgstr "Adresse IP ou Mac"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
+msgstr "Processus"
diff --git a/fusioninventory/locale/hu_HU/fusiondirectory.po b/fusioninventory/locale/hu_HU/fusiondirectory.po
index 167ca04515..515b215fa9 100644
--- a/fusioninventory/locale/hu_HU/fusiondirectory.po
+++ b/fusioninventory/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:44+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Felhasználók"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Felhasználók"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/id/fusiondirectory.po b/fusioninventory/locale/id/fusiondirectory.po
index a8e20670fe..a5ceb74740 100644
--- a/fusioninventory/locale/id/fusiondirectory.po
+++ b/fusioninventory/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/it_IT/fusiondirectory.po b/fusioninventory/locale/it_IT/fusiondirectory.po
index 19c47a853c..71dc1cb79e 100644
--- a/fusioninventory/locale/it_IT/fusiondirectory.po
+++ b/fusioninventory/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -18,6 +18,56 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr "Configurazione del FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr "Plugin di configurazione Fusioninventory di FusionDirectory"
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr "FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr "Inventario RDN"
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr "Ramo in cui verranno immagazinati gli oggetti di inventario"
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr "Corrispondenza nell'inventario"
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr "Criteri per collegare un risultato d'inventario ad un sistema"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr "Indirizzo MAC"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "Indirizzo IP"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr "Entrambi"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr "Indirizzo IP o MAC"
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr "Nessuna etichetta"
@@ -55,35 +105,6 @@ msgstr "Oggetti d'inventario"
 msgid "Browse inventory objects"
 msgstr "Sfoglia gli oggetti d'inventario"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr "Inventario"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr "Visualizzatore inventario"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr "Oggetti d'inventario"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr "Hardware"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr "Programma"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Utenti"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr "Processi"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Configurazione"
@@ -141,56 +162,35 @@ msgstr "Fiducia"
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr "Indirizzi IP permessi per lanciare i compiti dell'inventario attraverso un'interfaccia Web"
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr "FusionInventory"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr "Configurazione dell'agente Fusioninventory"
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr "Configurazione del FusionInventory"
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr "Plugin di configurazione Fusioninventory di FusionDirectory"
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr "Inventario RDN"
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
-msgstr "Ramo in cui verranno immagazinati gli oggetti di inventario"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
+msgstr "Inventario"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
-msgstr "Corrispondenza nell'inventario"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
+msgstr "Visualizzatore inventario"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
-msgstr "Criteri per collegare un risultato d'inventario ad un sistema"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
+msgstr "Oggetti d'inventario"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
-msgstr "Indirizzo MAC"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
+msgstr "Hardware"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "Indirizzo IP"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
+msgstr "Programma"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr "Entrambi"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Utenti"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
-msgstr "Indirizzo IP o MAC"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
+msgstr "Processi"
diff --git a/fusioninventory/locale/lv/fusiondirectory.po b/fusioninventory/locale/lv/fusiondirectory.po
index 0c86b1e7ff..af6e6bad2a 100644
--- a/fusioninventory/locale/lv/fusiondirectory.po
+++ b/fusioninventory/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Lietotāji"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Lietotāji"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/nb/fusiondirectory.po b/fusioninventory/locale/nb/fusiondirectory.po
index b376d4681c..d1ea49d0bc 100644
--- a/fusioninventory/locale/nb/fusiondirectory.po
+++ b/fusioninventory/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/nl/fusiondirectory.po b/fusioninventory/locale/nl/fusiondirectory.po
index 465f217183..e8e7441fce 100644
--- a/fusioninventory/locale/nl/fusiondirectory.po
+++ b/fusioninventory/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr "Mac adress"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "IP adres"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr "Hardware"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr "Software"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Gebruikers"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Configuratie"
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
-msgstr "Mac adress"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
+msgstr "Hardware"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "IP adres"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
+msgstr "Software"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Gebruikers"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/pl/fusiondirectory.po b/fusioninventory/locale/pl/fusiondirectory.po
index 8b4a54e1e3..61e4362ff4 100644
--- a/fusioninventory/locale/pl/fusiondirectory.po
+++ b/fusioninventory/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "adres IP"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Użytkownicy"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Konfiguracja"
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "adres IP"
-
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Użytkownicy"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/pt/fusiondirectory.po b/fusioninventory/locale/pt/fusiondirectory.po
index d4941f9524..9874d9e9fc 100644
--- a/fusioninventory/locale/pt/fusiondirectory.po
+++ b/fusioninventory/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Usuários"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Configuração"
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Usuários"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/pt_BR/fusiondirectory.po b/fusioninventory/locale/pt_BR/fusiondirectory.po
index 79b6eed843..75ce5c307d 100644
--- a/fusioninventory/locale/pt_BR/fusiondirectory.po
+++ b/fusioninventory/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr "Configuração "
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr "Configuração de plugin FusionDirectory FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr "FusionInventory"
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr "Inventário RDN"
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr "Ramo o qual objetos de inventário serão armazenados"
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr "Inventário correspondente"
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr "Critérios para ligar um resultado de inventário a um sistema"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr "Endereço MAC"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "Endereço IP"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr "Ambos"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr "IP ou endereço MAC"
+
+#: html/collect.php:78
+#, 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."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr "SEM RÓTULO"
@@ -54,35 +104,6 @@ msgstr "Objetos de inventário"
 msgid "Browse inventory objects"
 msgstr "Navegar em objetos de inventário"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr "Inventário"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr "Visualizador de inventário"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr "Objeto de inventário"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr "Hardware"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr "Software"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Usuários"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr "Processos"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Configuração"
@@ -140,56 +161,35 @@ msgstr "Confiar"
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr "IPs autorizados a realizar tarefas de inventário através da interface web"
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr "FusionInventory"
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr "Agente de configuração "
 
-#: html/collect.php:78
-#, 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."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr "Configuração "
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr "Configuração de plugin FusionDirectory FusionInventory"
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr "Inventário RDN"
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
-msgstr "Ramo o qual objetos de inventário serão armazenados"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
+msgstr "Inventário"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
-msgstr "Inventário correspondente"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
+msgstr "Visualizador de inventário"
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
-msgstr "Critérios para ligar um resultado de inventário a um sistema"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
+msgstr "Objeto de inventário"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
-msgstr "Endereço MAC"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
+msgstr "Hardware"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "Endereço IP"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
+msgstr "Software"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr "Ambos"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Usuários"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
-msgstr "IP ou endereço MAC"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
+msgstr "Processos"
diff --git a/fusioninventory/locale/ru/fusiondirectory.po b/fusioninventory/locale/ru/fusiondirectory.po
index 83392d4214..7d754bda6d 100644
--- a/fusioninventory/locale/ru/fusiondirectory.po
+++ b/fusioninventory/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-08 19:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr "Mac адрес"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr "IP адрес"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr "Оба"
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr "IP или MAC адрес"
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr "Конфигурация FusionDirectory %s/%s не читаема. Прервано."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr "Програмное обеспечение"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Пользователи"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Настройки"
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "Конфигурация FusionDirectory %s/%s не читаема. Прервано."
-
-#: 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"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
-msgstr "Mac адрес"
-
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
-msgstr "IP адрес"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
+msgstr "Програмное обеспечение"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr "Оба"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Пользователи"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
-msgstr "IP или MAC адрес"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
+msgstr ""
diff --git a/fusioninventory/locale/ru@petr1708/fusiondirectory.po b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
index 391420d015..27b488c464 100644
--- a/fusioninventory/locale/ru@petr1708/fusiondirectory.po
+++ b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/sv/fusiondirectory.po b/fusioninventory/locale/sv/fusiondirectory.po
index 5bd5459b74..21c694abd7 100644
--- a/fusioninventory/locale/sv/fusiondirectory.po
+++ b/fusioninventory/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr "FusionDirectory-konfiguration %s/%s är inte läsbar. Avbryter."
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr "INGEN ETIKETT"
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Användare"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Konfiguration"
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "FusionDirectory-konfiguration %s/%s är inte läsbar. Avbryter."
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Användare"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/ug/fusiondirectory.po b/fusioninventory/locale/ug/fusiondirectory.po
index 595a9c52d3..be6e9a8789 100644
--- a/fusioninventory/locale/ug/fusiondirectory.po
+++ b/fusioninventory/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/vi_VN/fusiondirectory.po b/fusioninventory/locale/vi_VN/fusiondirectory.po
index e5b428c549..bea4bc9aa9 100644
--- a/fusioninventory/locale/vi_VN/fusiondirectory.po
+++ b/fusioninventory/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "Người dùng"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr "Cấu hình"
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "Người dùng"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/fusioninventory/locale/zh/fusiondirectory.po b/fusioninventory/locale/zh/fusiondirectory.po
index 2589b62b5b..f6edd860b8 100644
--- a/fusioninventory/locale/zh/fusiondirectory.po
+++ b/fusioninventory/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:28+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,56 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:41
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+msgid "FusionInventory"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:78
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
 msgstr ""
@@ -54,35 +104,6 @@ msgstr ""
 msgid "Browse inventory objects"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
-msgid "Inventory"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
-msgid "Inventory Viewer"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
-msgid "Inventory object"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
-msgid "Hardware"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
-msgid "Software"
-msgstr ""
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
-msgid "Users"
-msgstr "用户"
-
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
-msgid "Processes"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
 msgstr ""
@@ -140,56 +161,35 @@ msgstr ""
 msgid "IPs allowed to launch inventory task through web interface"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
-#: config/fusioninventory/class_fiConfig.inc:41
-msgid "FusionInventory"
-msgstr ""
-
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: html/collect.php:78
-#, php-format
-msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:28
-msgid "FusionInventory configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:29
-msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Inventory RDN"
-msgstr ""
-
-#: config/fusioninventory/class_fiConfig.inc:44
-msgid "Branch in which inventory objects will be stored"
+#: admin/systems/fusioninventory/class_fiInventory.inc:67
+msgid "Inventory"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Inventory matching"
+#: admin/systems/fusioninventory/class_fiInventory.inc:68
+msgid "Inventory Viewer"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:49
-msgid "Criteria to link an inventory result to a system"
+#: admin/systems/fusioninventory/class_fiInventory.inc:73
+#: admin/systems/fusioninventory/class_fiInventory.inc:77
+msgid "Inventory object"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:91
+msgid "Hardware"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:97
+msgid "Software"
 msgstr ""
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "Both"
-msgstr ""
+#: admin/systems/fusioninventory/class_fiInventory.inc:103
+msgid "Users"
+msgstr "用户"
 
-#: config/fusioninventory/class_fiConfig.inc:52
-msgid "IP or Mac address"
+#: admin/systems/fusioninventory/class_fiInventory.inc:109
+msgid "Processes"
 msgstr ""
diff --git a/gpg/locale/ar/fusiondirectory.po b/gpg/locale/ar/fusiondirectory.po
index 32fc587810..6333a745e3 100644
--- a/gpg/locale/ar/fusiondirectory.po
+++ b/gpg/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,41 +17,64 @@ 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"
 
-#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
-#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
-msgid "GPG server info"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
 msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr ""
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr "النوع"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
 msgstr ""
diff --git a/gpg/locale/ca/fusiondirectory.po b/gpg/locale/ca/fusiondirectory.po
index 3d325f0c4e..fdc9bc2af1 100644
--- a/gpg/locale/ca/fusiondirectory.po
+++ b/gpg/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: ca\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Error de la configuració"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Error d'LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr ""
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Error de la configuració"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Error d'LDAP"
diff --git a/gpg/locale/cs_CZ/fusiondirectory.po b/gpg/locale/cs_CZ/fusiondirectory.po
index a84e000055..2c92362685 100644
--- a/gpg/locale/cs_CZ/fusiondirectory.po
+++ b/gpg/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 "Informace o GPG serveru"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
+msgstr "GPG klíče"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
-msgstr "Programové vybavení"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr "GPG klíče tohoto uživatele"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
-msgstr "Která implementace GPG je používána na tomto serveru s klíči"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
+msgstr "GPG"
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
-msgstr "Verze GPG"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
+msgstr "Upravit GPG identifikátory uživatele"
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
-msgstr "Jaká verze nástroje GPG je na tomto serveru s klíči provozována"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Chyba v nastavení"
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
-msgstr "Větev, ve kterou jsou uloženy klíče"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
+msgstr "Nejprve je třeba prostřednictvím sekce přídavky nastavit základ GPG"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
-msgstr "Relativní rozlišený název klíčů"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
+msgstr "Identifikátor klíče"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
-msgstr "Větev pod základem, ve které jsou uloženy klíče"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Identifikátor uživatele"
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Chyba LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr "Čas vytvoření"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr "Skončení platnosti"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr "Algoritmus"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Velikost"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr "Platnost odvolána"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Vypnuto"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr "Vyberte požadované položky"
 msgid "PGP Key"
 msgstr "PGP klíč"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr "Identifikátor klíče"
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Uživatel"
@@ -83,57 +101,39 @@ msgstr "Datum skončení platnosti"
 msgid "Type"
 msgstr "Typ"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Velikost"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr "Platnost odvolána"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Vypnuto"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Chyba v nastavení"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
-msgstr "Nejprve je třeba prostřednictvím sekce přídavky nastavit základ GPG"
+#: 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 "Informace o GPG serveru"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Identifikátor uživatele"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr "Programové vybavení"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
-msgstr "Čas vytvoření"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
+msgstr "Která implementace GPG je používána na tomto serveru s klíči"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
-msgstr "Skončení platnosti"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
+msgstr "Verze GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
-msgstr "Algoritmus"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
+msgstr "Jaká verze nástroje GPG je na tomto serveru s klíči provozována"
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
-msgstr "GPG klíče"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
+msgstr "Větev, ve kterou jsou uloženy klíče"
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
-msgstr "GPG klíče tohoto uživatele"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
+msgstr "Relativní rozlišený název klíčů"
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
-msgstr "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
+msgstr "Větev pod základem, ve které jsou uloženy klíče"
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr "Upravit GPG identifikátory uživatele"
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Chyba LDAP"
diff --git a/gpg/locale/de/fusiondirectory.po b/gpg/locale/de/fusiondirectory.po
index a42f1a1a47..d1df3a926a 100644
--- a/gpg/locale/de/fusiondirectory.po
+++ b/gpg/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: de\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 "GPG-Serverinfo"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
+msgstr "GPG-Schlüssel"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
-msgstr "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr "GPG-Schlüssel dieses Benutzers"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
+msgstr "GPG"
+
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
-msgstr "GPG-Version"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Konfigurationsfehler"
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
-msgstr ""
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
+msgstr "Schlüsselkennung"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
-msgstr ""
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Benutzer-ID"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
-msgstr ""
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr "Erstellungszeitpunkt"
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP-Fehler"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr "Ablauf"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr "Algorithmus"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Größe"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr "Widerrufen"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Deaktiviert"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr "Bitte wählen Sie die gewünschten Einträge"
 msgid "PGP Key"
 msgstr "PGP-Schlüssel"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr "Schlüsselkennung"
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Benutzer"
@@ -83,57 +101,39 @@ msgstr "Ablaufdatum"
 msgid "Type"
 msgstr "Typ"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Größe"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr "Widerrufen"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Deaktiviert"
+#: 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 "GPG-Serverinfo"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Konfigurationsfehler"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr "Software"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Benutzer-ID"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
-msgstr "Erstellungszeitpunkt"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
-msgstr "Ablauf"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
-msgstr "Algorithmus"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
+msgstr "GPG-Version"
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
-msgstr "GPG-Schlüssel"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
+msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
-msgstr "GPG-Schlüssel dieses Benutzers"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
+msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
-msgstr "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
+msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "LDAP-Fehler"
diff --git a/gpg/locale/el_GR/fusiondirectory.po b/gpg/locale/el_GR/fusiondirectory.po
index 475b3adac8..e72c6a4b9c 100644
--- a/gpg/locale/el_GR/fusiondirectory.po
+++ b/gpg/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,42 +18,65 @@ msgstr ""
 "Language: el_GR\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 "Πληροφορίες εξυπηρετητή GPG"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
+msgstr "Κλειδιά GPG"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
-msgstr "Λογισμικό."
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr "Κλειδιά GPG αυτού του χρήστη"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
-msgstr "Ποιο λογισμικό  εκτελείται σε αυτό τον εξυπηρετητής κλειδιών GPG"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
+msgstr "GPG"
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
-msgstr "Έκδοση GPG"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
+msgstr "Επεξεργασία αναγνωριστικού χρήστη GPG"
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
-msgstr "Ποιά έκδοση του GPG που εκτελείται αυτός ο εξυπηρετητής κλειδιών"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Σφάλμα ρύθμισης"
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
-msgstr "Κλάδος στο οποίο αποθηκεύονται τα κλειδιά"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
+msgstr "Θα πρέπει να ρυθμίσετε την GPG base dn μέσω την ενότητας προσθέτωβ πρώτα"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
-msgstr "Κλειδιά RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
+msgstr "Αναγνωριστικό κλειδιού"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
-msgstr "Κλάδος κάτω από την βάση όπου αποθηκεύονται τα κλειδιά"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Αναγνωριστικό χρήστη"
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Σφάλμα LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr "Ημερομηνία δημιουργίας"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr "Λήξη"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr "Αλγόριθμος"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Μέγεθος"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr "Ανεκλήθη"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Απενεργοποιημένο"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -63,11 +86,6 @@ msgstr "Παρακαλώ επιλέξτε τις επιθυμητές καταχ
 msgid "PGP Key"
 msgstr "Κλειδί PGP"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr "Αναγνωριστικό κλειδιού"
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Χρήστης"
@@ -84,57 +102,39 @@ msgstr "Ημερομηνία λήξης"
 msgid "Type"
 msgstr "Τύπος"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Μέγεθος"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr "Ανεκλήθη"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Απενεργοποιημένο"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Σφάλμα ρύθμισης"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
-msgstr "Θα πρέπει να ρυθμίσετε την GPG base dn μέσω την ενότητας προσθέτωβ πρώτα"
+#: 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 "Πληροφορίες εξυπηρετητή GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Αναγνωριστικό χρήστη"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr "Λογισμικό."
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
-msgstr "Ημερομηνία δημιουργίας"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
+msgstr "Ποιο λογισμικό  εκτελείται σε αυτό τον εξυπηρετητής κλειδιών GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
-msgstr "Λήξη"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
+msgstr "Έκδοση GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
-msgstr "Αλγόριθμος"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
+msgstr "Ποιά έκδοση του GPG που εκτελείται αυτός ο εξυπηρετητής κλειδιών"
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
-msgstr "Κλειδιά GPG"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
+msgstr "Κλάδος στο οποίο αποθηκεύονται τα κλειδιά"
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
-msgstr "Κλειδιά GPG αυτού του χρήστη"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
+msgstr "Κλειδιά RDN"
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
-msgstr "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
+msgstr "Κλάδος κάτω από την βάση όπου αποθηκεύονται τα κλειδιά"
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr "Επεξεργασία αναγνωριστικού χρήστη GPG"
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Σφάλμα LDAP"
diff --git a/gpg/locale/es/fusiondirectory.po b/gpg/locale/es/fusiondirectory.po
index eca62189a3..8bc968d921 100644
--- a/gpg/locale/es/fusiondirectory.po
+++ b/gpg/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: es\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
-msgstr "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Error en la configuración"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Identificador (ID) de usuario"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Error LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Tamaño"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Desactivado"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr "Por favor seleccione las entradas que desee"
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Usuario"
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr "Tipo"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Tamaño"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Desactivado"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Error en la configuración"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Identificador (ID) de usuario"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr "Software"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Error LDAP"
diff --git a/gpg/locale/es_CO/fusiondirectory.po b/gpg/locale/es_CO/fusiondirectory.po
index 39e7630339..71daaedb7d 100644
--- a/gpg/locale/es_CO/fusiondirectory.po
+++ b/gpg/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: es_CO\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Error de configuración"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "ID de usuario"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Error LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr "Por favor elija las entradas que desea"
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Usuario"
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr "Tipo"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Error de configuración"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "ID de usuario"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Error LDAP"
diff --git a/gpg/locale/es_VE/fusiondirectory.po b/gpg/locale/es_VE/fusiondirectory.po
index 6df724c569..888ba15992 100644
--- a/gpg/locale/es_VE/fusiondirectory.po
+++ b/gpg/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: es_VE\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
-msgstr "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Error en la configuración"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Identificador (ID) de usuario"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Error de LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Tamaño"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Desactivado"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr "Por favor seleccione las entradas que desee"
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Usuario"
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr "Tipo"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Tamaño"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Desactivado"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Error en la configuración"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Identificador (ID) de usuario"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr "Software"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Error de LDAP"
diff --git a/gpg/locale/fa_IR/fusiondirectory.po b/gpg/locale/fa_IR/fusiondirectory.po
index 5f5c29dc33..a562fcb4a9 100644
--- a/gpg/locale/fa_IR/fusiondirectory.po
+++ b/gpg/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: fa_IR\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "خطای LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr ""
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "خطای LDAP"
diff --git a/gpg/locale/fi_FI/fusiondirectory.po b/gpg/locale/fi_FI/fusiondirectory.po
index 997792bdab..583463f22c 100644
--- a/gpg/locale/fi_FI/fusiondirectory.po
+++ b/gpg/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:45+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: fi_FI\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Käyttäjätunnus"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP virhe"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr ""
@@ -83,57 +101,39 @@ msgstr "Eräpäivä"
 msgid "Type"
 msgstr "Tyyppi"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Käyttäjätunnus"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "LDAP virhe"
diff --git a/gpg/locale/fr/fusiondirectory.po b/gpg/locale/fr/fusiondirectory.po
index fc23a8fb91..a73d0218b6 100644
--- a/gpg/locale/fr/fusiondirectory.po
+++ b/gpg/locale/fr/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -20,42 +20,65 @@ msgstr ""
 "Language: fr\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 "Informations du le serveur GPG"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
+msgstr "Clefs GPG"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
-msgstr "Logiciel"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr "Liste des clefs GPG publiques pour cet utilisateur"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
-msgstr "Quel logiciel ce serveur de clés GPG utilise"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
+msgstr "GPG"
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
-msgstr "Version de GPG"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
+msgstr "Modifier les identifiants GPG de l'utilisateur"
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
-msgstr "Version de GPG que ce serveur de clés utilise"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Erreur de configuration"
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
-msgstr "Branche où seront stockées les clefs GPG"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
+msgstr "Vous devez configurer d'abord le DN de base de GPG, dans la section «Configuration»"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
-msgstr "Branche des clés"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
+msgstr "ID de la clef"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
-msgstr "Branche où seront stockées les clefs GPG"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "ID de l'utilisateur"
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Erreur LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr "Date de création"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr "Date d'expiration"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr "Algorithme"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Taille"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr "Révoquée"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Désactivée"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -65,11 +88,6 @@ msgstr "Veuillez sélectionner les entrées désirées"
 msgid "PGP Key"
 msgstr "Clef PGP"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr "ID de la clef"
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Utilisateur"
@@ -86,57 +104,39 @@ msgstr "Date d'expiration"
 msgid "Type"
 msgstr "Type"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Taille"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr "Révoquée"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Désactivée"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Erreur de configuration"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
-msgstr "Vous devez configurer d'abord le DN de base de GPG, dans la section «Configuration»"
+#: 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 "Informations du le serveur GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "ID de l'utilisateur"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr "Logiciel"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
-msgstr "Date de création"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
+msgstr "Quel logiciel ce serveur de clés GPG utilise"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
-msgstr "Date d'expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
+msgstr "Version de GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
-msgstr "Algorithme"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
+msgstr "Version de GPG que ce serveur de clés utilise"
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
-msgstr "Clefs GPG"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
+msgstr "Branche où seront stockées les clefs GPG"
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
-msgstr "Liste des clefs GPG publiques pour cet utilisateur"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
+msgstr "Branche des clés"
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
-msgstr "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
+msgstr "Branche où seront stockées les clefs GPG"
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr "Modifier les identifiants GPG de l'utilisateur"
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Erreur LDAP"
diff --git a/gpg/locale/hu_HU/fusiondirectory.po b/gpg/locale/hu_HU/fusiondirectory.po
index 46de823755..ce53e078df 100644
--- a/gpg/locale/hu_HU/fusiondirectory.po
+++ b/gpg/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:45+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,41 +17,64 @@ msgstr ""
 "Language: hu_HU\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
 msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr ""
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
 msgstr ""
diff --git a/gpg/locale/id/fusiondirectory.po b/gpg/locale/id/fusiondirectory.po
index b882246ba9..deafafbd0c 100644
--- a/gpg/locale/id/fusiondirectory.po
+++ b/gpg/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:45+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,41 +17,64 @@ msgstr ""
 "Language: id\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
 msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr ""
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
 msgstr ""
diff --git a/gpg/locale/it_IT/fusiondirectory.po b/gpg/locale/it_IT/fusiondirectory.po
index 051efcdc47..6baddc09d2 100644
--- a/gpg/locale/it_IT/fusiondirectory.po
+++ b/gpg/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,42 +19,65 @@ msgstr ""
 "Language: it_IT\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 "Informazioni sul server GPG"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
+msgstr "Chiavi GPG"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
-msgstr "Programma"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr "Chiavi GPG di questo utente"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
-msgstr "Quale programma è in corso d'esecuzione sul server di chiavi GPG"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
+msgstr "GPG"
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
-msgstr "Versione GPG"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
+msgstr "Modifica gli IDs GPG degli utenti"
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
-msgstr "Quale versione di GPG è in esecuzione su questo server di chiavi GPG"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Errore di configurazione"
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
-msgstr "Ramo dell'annuario nel quale saranno immagazzinate le chiavi"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
+msgstr "Devi prima di tutto configurare la bse dn per GPG, nella sezione addons"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
-msgstr "RDN chiavi"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
+msgstr "ID della chiave"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
-msgstr "Ramo sotto la base nel quale saranno immagazzinate le chiavi"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "ID dell'utente"
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Errore LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr "Data di creazione"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr "Data di scadenza"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr "Algoritmo"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Dimensione"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr "Revocato"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Disabilitato"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -64,11 +87,6 @@ msgstr "Seleziona le entries desiderate"
 msgid "PGP Key"
 msgstr "Chiave PGP"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr "ID della chiave"
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Utente"
@@ -85,57 +103,39 @@ msgstr "Data di scadenza"
 msgid "Type"
 msgstr "Tipo"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Dimensione"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr "Revocato"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Disabilitato"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Errore di configurazione"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
-msgstr "Devi prima di tutto configurare la bse dn per GPG, nella sezione addons"
+#: 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 "Informazioni sul server GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "ID dell'utente"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr "Programma"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
-msgstr "Data di creazione"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
+msgstr "Quale programma è in corso d'esecuzione sul server di chiavi GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
-msgstr "Data di scadenza"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
+msgstr "Versione GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
-msgstr "Algoritmo"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
+msgstr "Quale versione di GPG è in esecuzione su questo server di chiavi GPG"
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
-msgstr "Chiavi GPG"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
+msgstr "Ramo dell'annuario nel quale saranno immagazzinate le chiavi"
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
-msgstr "Chiavi GPG di questo utente"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
+msgstr "RDN chiavi"
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
-msgstr "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
+msgstr "Ramo sotto la base nel quale saranno immagazzinate le chiavi"
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr "Modifica gli IDs GPG degli utenti"
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Errore LDAP"
diff --git a/gpg/locale/lv/fusiondirectory.po b/gpg/locale/lv/fusiondirectory.po
index 83278bcfb4..88f6bd2821 100644
--- a/gpg/locale/lv/fusiondirectory.po
+++ b/gpg/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
-#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
-msgid "GPG server info"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Lietotāja ID"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP kļūda"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr ""
@@ -83,57 +101,39 @@ msgstr "Derīguma termiņš"
 msgid "Type"
 msgstr "Veids"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Lietotāja ID"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "LDAP kļūda"
diff --git a/gpg/locale/nb/fusiondirectory.po b/gpg/locale/nb/fusiondirectory.po
index fda0aea942..548b46c6ae 100644
--- a/gpg/locale/nb/fusiondirectory.po
+++ b/gpg/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: nb\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP-feil"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Bruker"
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "LDAP-feil"
diff --git a/gpg/locale/nl/fusiondirectory.po b/gpg/locale/nl/fusiondirectory.po
index a01d4f5d6b..92ffaee38d 100644
--- a/gpg/locale/nl/fusiondirectory.po
+++ b/gpg/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: nl\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
-msgstr "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Configuratie fout"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Gebruikers ID"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP fout"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Grootte"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Niet actief"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr "Gelieve de gegevens te selecteren"
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Gebruiker"
@@ -83,57 +101,39 @@ msgstr "Vervaldatum"
 msgid "Type"
 msgstr "Type"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Grootte"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Niet actief"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Configuratie fout"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Gebruikers ID"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr "Software"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "LDAP fout"
diff --git a/gpg/locale/pl/fusiondirectory.po b/gpg/locale/pl/fusiondirectory.po
index 6e45505698..cfd2e20dd4 100644
--- a/gpg/locale/pl/fusiondirectory.po
+++ b/gpg/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
-#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
-msgid "GPG server info"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Błąd konfiguracji"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Identyfikator użytkownika"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "błąd LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Rozmiar"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Wyłączone"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Użytkownik"
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr "Typ"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Rozmiar"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Wyłączone"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Błąd konfiguracji"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Identyfikator użytkownika"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "błąd LDAP"
diff --git a/gpg/locale/pt/fusiondirectory.po b/gpg/locale/pt/fusiondirectory.po
index a274728d54..b201deb2c2 100644
--- a/gpg/locale/pt/fusiondirectory.po
+++ b/gpg/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: pt\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Erro de configuração"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "ID do usuário"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Erro de LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Usuário"
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr "Tipo"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Erro de configuração"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "ID do usuário"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Erro de LDAP"
diff --git a/gpg/locale/pt_BR/fusiondirectory.po b/gpg/locale/pt_BR/fusiondirectory.po
index 0cefe7b85a..e64d755ed0 100644
--- a/gpg/locale/pt_BR/fusiondirectory.po
+++ b/gpg/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: pt_BR\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
-msgstr "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Erro de configuração"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "ID de usuário"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Erro de LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Tamanho"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr "Por favor, selecione as entradas desejadas"
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Usuário"
@@ -83,57 +101,39 @@ msgstr "Data de expiração"
 msgid "Type"
 msgstr "Tipo"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Tamanho"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Erro de configuração"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "ID de usuário"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr "Software"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Erro de LDAP"
diff --git a/gpg/locale/ru/fusiondirectory.po b/gpg/locale/ru/fusiondirectory.po
index 0ae6a127d4..03cd51e797 100644
--- a/gpg/locale/ru/fusiondirectory.po
+++ b/gpg/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-12 05:51+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -19,42 +19,65 @@ 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"
 
-#: 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 "Информация об GPG сервере"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
+msgstr "GPG ключи"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
-msgstr "Програмное обеспечение"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr "GPG ключи пользователя"
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
+msgstr "GPG"
+
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
-msgstr "Версия GPG"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Ошибка конфигурации"
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
-msgstr "Ветка в которой хранятся ключи"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
+msgstr "ID ключа"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
-msgstr "RDN для ключей"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Идентификатор пользователя"
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
-msgstr "Ветка в которой будут храниться ключи"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr "Время создания"
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Ошибка LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr "Когда истекает"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr "Алгоритм"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Размер"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr "Отозван"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Отключен"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -64,11 +87,6 @@ msgstr "Пожалуйста выберете нужные записи"
 msgid "PGP Key"
 msgstr "Ключ PGP"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr "ID ключа"
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Пользователь"
@@ -85,57 +103,39 @@ msgstr "Дата окончания действия"
 msgid "Type"
 msgstr "Тип"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Размер"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr "Отозван"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Отключен"
+#: 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 "Информация об GPG сервере"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Ошибка конфигурации"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr "Програмное обеспечение"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Идентификатор пользователя"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
-msgstr "Время создания"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
-msgstr "Когда истекает"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
+msgstr "Версия GPG"
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
-msgstr "Алгоритм"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
+msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
-msgstr "GPG ключи"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
+msgstr "Ветка в которой хранятся ключи"
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
-msgstr "GPG ключи пользователя"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
+msgstr "RDN для ключей"
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
-msgstr "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
+msgstr "Ветка в которой будут храниться ключи"
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Ошибка LDAP"
diff --git a/gpg/locale/ru@petr1708/fusiondirectory.po b/gpg/locale/ru@petr1708/fusiondirectory.po
index 6630e01da5..d0613d4326 100644
--- a/gpg/locale/ru@petr1708/fusiondirectory.po
+++ b/gpg/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:45+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,41 +17,64 @@ 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"
 
-#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
-#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
-msgid "GPG server info"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
 msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr ""
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
 msgstr ""
diff --git a/gpg/locale/sv/fusiondirectory.po b/gpg/locale/sv/fusiondirectory.po
index 253e153703..f22be32d97 100644
--- a/gpg/locale/sv/fusiondirectory.po
+++ b/gpg/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: sv\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Konfigurationsfel"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "Användar-ID"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP-fel"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "Storlek"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Avaktiverad"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr "Välj önskade poster"
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Användare"
@@ -83,57 +101,39 @@ msgstr "Utgångsdatum"
 msgid "Type"
 msgstr "Typ"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "Storlek"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Avaktiverad"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Konfigurationsfel"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "Användar-ID"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "LDAP-fel"
diff --git a/gpg/locale/ug/fusiondirectory.po b/gpg/locale/ug/fusiondirectory.po
index 54e7799ef8..9cab4a29b5 100644
--- a/gpg/locale/ug/fusiondirectory.po
+++ b/gpg/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:45+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,41 +17,64 @@ msgstr ""
 "Language: ug\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
 msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr ""
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
 msgstr ""
diff --git a/gpg/locale/vi_VN/fusiondirectory.po b/gpg/locale/vi_VN/fusiondirectory.po
index ec98248eba..854d66b28f 100644
--- a/gpg/locale/vi_VN/fusiondirectory.po
+++ b/gpg/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: vi_VN\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr "Lỗi cấu hình"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "ID người dùng"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Lá»—i LDAP"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr "Vô hiệu hóa/ Tắt chức năng"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "Người dùng"
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr "Loại"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr "Vô hiệu hóa/ Tắt chức năng"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
-msgstr "Lỗi cấu hình"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "ID người dùng"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "Lá»—i LDAP"
diff --git a/gpg/locale/zh/fusiondirectory.po b/gpg/locale/zh/fusiondirectory.po
index 969759929e..90439c37c9 100644
--- a/gpg/locale/zh/fusiondirectory.po
+++ b/gpg/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,42 +17,65 @@ msgstr ""
 "Language: zh\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"
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Software"
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:60
-msgid "Which software this GPG key server is running"
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "GPG version"
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:65
-msgid "Which version of GPG this key server is running"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:70
-msgid "Branch in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Keys RDN"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:74
-msgid "Branch under base in which keys are stored"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
+msgid "User ID"
+msgstr "用户 ID"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+msgid "Creation time"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP 错误"
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr "大小"
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
@@ -62,11 +85,6 @@ msgstr ""
 msgid "PGP Key"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:136
-msgid "Key ID"
-msgstr ""
-
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
 msgstr "用户"
@@ -83,57 +101,39 @@ msgstr ""
 msgid "Type"
 msgstr "类型"
 
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
-msgid "Size"
-msgstr "大小"
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
-msgid "Revoked"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
-msgid "Disabled"
-msgstr ""
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "Configuration error"
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
-msgid "You need to configure GPG base dn through the addons section first"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:137
-msgid "User ID"
-msgstr "用户 ID"
-
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
-msgid "Creation time"
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
-msgid "Expiration"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
 msgstr ""
 
-#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
-msgid "Algorithm"
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:31
-msgid "GPG keys"
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:35
-msgid "GPG keys of this user"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:46
-msgid "GPG"
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: personal/gpg/class_gpgAccount.inc:47
-msgid "Edit user's GPG IDs"
-msgstr ""
+#: addons/gpg/class_pgpServerInfo.inc:100
+msgid "LDAP error"
+msgstr "LDAP 错误"
diff --git a/ipmi/locale/ar/fusiondirectory.po b/ipmi/locale/ar/fusiondirectory.po
index 70a7c5211e..350590ccab 100644
--- a/ipmi/locale/ar/fusiondirectory.po
+++ b/ipmi/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/ipmi/locale/ca/fusiondirectory.po b/ipmi/locale/ca/fusiondirectory.po
index a57be2f811..5673ee7e3f 100644
--- a/ipmi/locale/ca/fusiondirectory.po
+++ b/ipmi/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/ipmi/locale/cs_CZ/fusiondirectory.po b/ipmi/locale/cs_CZ/fusiondirectory.po
index 3849d0e16a..ae0f88ea2c 100644
--- a/ipmi/locale/cs_CZ/fusiondirectory.po
+++ b/ipmi/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/ipmi/locale/de/fusiondirectory.po b/ipmi/locale/de/fusiondirectory.po
index 385f7d6811..251bd64059 100644
--- a/ipmi/locale/de/fusiondirectory.po
+++ b/ipmi/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/ipmi/locale/el_GR/fusiondirectory.po b/ipmi/locale/el_GR/fusiondirectory.po
index d14c43a5f1..0519ef4c2b 100644
--- a/ipmi/locale/el_GR/fusiondirectory.po
+++ b/ipmi/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/ipmi/locale/es/fusiondirectory.po b/ipmi/locale/es/fusiondirectory.po
index 90a600cce7..f0592387a6 100644
--- a/ipmi/locale/es/fusiondirectory.po
+++ b/ipmi/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/ipmi/locale/es_CO/fusiondirectory.po b/ipmi/locale/es_CO/fusiondirectory.po
index 5ff0a99231..b55c6d091a 100644
--- a/ipmi/locale/es_CO/fusiondirectory.po
+++ b/ipmi/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/ipmi/locale/es_VE/fusiondirectory.po b/ipmi/locale/es_VE/fusiondirectory.po
index 109733f415..f325ccf35f 100644
--- a/ipmi/locale/es_VE/fusiondirectory.po
+++ b/ipmi/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/ipmi/locale/fa_IR/fusiondirectory.po b/ipmi/locale/fa_IR/fusiondirectory.po
index b0ea5c66e6..53c6269b41 100644
--- a/ipmi/locale/fa_IR/fusiondirectory.po
+++ b/ipmi/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/ipmi/locale/fi_FI/fusiondirectory.po b/ipmi/locale/fi_FI/fusiondirectory.po
index a802356a00..bb38b526e4 100644
--- a/ipmi/locale/fi_FI/fusiondirectory.po
+++ b/ipmi/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/ipmi/locale/fr/fusiondirectory.po b/ipmi/locale/fr/fusiondirectory.po
index 344549acee..00d53aab0e 100644
--- a/ipmi/locale/fr/fusiondirectory.po
+++ b/ipmi/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/ipmi/locale/hu_HU/fusiondirectory.po b/ipmi/locale/hu_HU/fusiondirectory.po
index def8d111d2..9da0989f07 100644
--- a/ipmi/locale/hu_HU/fusiondirectory.po
+++ b/ipmi/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/ipmi/locale/id/fusiondirectory.po b/ipmi/locale/id/fusiondirectory.po
index cd8f1bdec3..f10248e58d 100644
--- a/ipmi/locale/id/fusiondirectory.po
+++ b/ipmi/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/ipmi/locale/it_IT/fusiondirectory.po b/ipmi/locale/it_IT/fusiondirectory.po
index 6b1ce33e3c..c6a7c11421 100644
--- a/ipmi/locale/it_IT/fusiondirectory.po
+++ b/ipmi/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:23+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/ipmi/locale/lv/fusiondirectory.po b/ipmi/locale/lv/fusiondirectory.po
index 9023c9db44..3e03fe6138 100644
--- a/ipmi/locale/lv/fusiondirectory.po
+++ b/ipmi/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/ipmi/locale/nb/fusiondirectory.po b/ipmi/locale/nb/fusiondirectory.po
index 06e6edc16e..447a696df1 100644
--- a/ipmi/locale/nb/fusiondirectory.po
+++ b/ipmi/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/ipmi/locale/nl/fusiondirectory.po b/ipmi/locale/nl/fusiondirectory.po
index d78525bbd4..2ad44669de 100644
--- a/ipmi/locale/nl/fusiondirectory.po
+++ b/ipmi/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/ipmi/locale/pl/fusiondirectory.po b/ipmi/locale/pl/fusiondirectory.po
index 6dba9269a4..c783346a05 100644
--- a/ipmi/locale/pl/fusiondirectory.po
+++ b/ipmi/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/ipmi/locale/pt/fusiondirectory.po b/ipmi/locale/pt/fusiondirectory.po
index 33e5e4fb93..aaa3ed6f9d 100644
--- a/ipmi/locale/pt/fusiondirectory.po
+++ b/ipmi/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/ipmi/locale/pt_BR/fusiondirectory.po b/ipmi/locale/pt_BR/fusiondirectory.po
index f0238246df..cc4876be1f 100644
--- a/ipmi/locale/pt_BR/fusiondirectory.po
+++ b/ipmi/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/ipmi/locale/ru/fusiondirectory.po b/ipmi/locale/ru/fusiondirectory.po
index 3d2172c634..5020661c83 100644
--- a/ipmi/locale/ru/fusiondirectory.po
+++ b/ipmi/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/ipmi/locale/ru@petr1708/fusiondirectory.po b/ipmi/locale/ru@petr1708/fusiondirectory.po
index eb93e1e711..5d4847a1a2 100644
--- a/ipmi/locale/ru@petr1708/fusiondirectory.po
+++ b/ipmi/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/ipmi/locale/sv/fusiondirectory.po b/ipmi/locale/sv/fusiondirectory.po
index 363c8c1d59..0f2c61749b 100644
--- a/ipmi/locale/sv/fusiondirectory.po
+++ b/ipmi/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/ipmi/locale/ug/fusiondirectory.po b/ipmi/locale/ug/fusiondirectory.po
index 4fdbf3cc67..e000d62d8f 100644
--- a/ipmi/locale/ug/fusiondirectory.po
+++ b/ipmi/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/ipmi/locale/vi_VN/fusiondirectory.po b/ipmi/locale/vi_VN/fusiondirectory.po
index dea1e92440..79e29f0630 100644
--- a/ipmi/locale/vi_VN/fusiondirectory.po
+++ b/ipmi/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/ipmi/locale/zh/fusiondirectory.po b/ipmi/locale/zh/fusiondirectory.po
index 98270eb937..0583427521 100644
--- a/ipmi/locale/zh/fusiondirectory.po
+++ b/ipmi/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:46+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/kolab2/locale/ar/fusiondirectory.po b/kolab2/locale/ar/fusiondirectory.po
index c55468ecea..426489eb0c 100644
--- a/kolab2/locale/ar/fusiondirectory.po
+++ b/kolab2/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/ca/fusiondirectory.po b/kolab2/locale/ca/fusiondirectory.po
index 2141b9c15f..2753613719 100644
--- a/kolab2/locale/ca/fusiondirectory.po
+++ b/kolab2/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Error d'LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/cs_CZ/fusiondirectory.po b/kolab2/locale/cs_CZ/fusiondirectory.po
index 9f0b1e2745..75bbafd272 100644
--- a/kolab2/locale/cs_CZ/fusiondirectory.po
+++ b/kolab2/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr "Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr "Nastavení účtu v Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr "Účet v Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr "Pověření"
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "datový objem zprávy"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "u tohoto účtu není omezen datový objem zprávy"
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr "informace o Free/Busy"
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL adresa"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "Budoucí"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "dny"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr "Pravidla pro pozvánky"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr "Výchozí zásada"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr "Výchozí pravidla pozvánek"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr "Ruční"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "Vždy přijmout"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "vždy odmítnout"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "Odmítnout, pokud je v konfliktu"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr "zeptat se, pokud je v konfliktu"
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr "e-mailová adresa"
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr "Sada pravidel pro tuto e-mailovou adresu"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr "Neurčeno"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr "Zprávy"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr "Úkoly"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr "Deníky"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr "Kalendář"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr "Poznámky"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr "Příchozí"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr "Rozepsané"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr "Odeslané"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr "Nevyžádaná pošta"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr "Výchozí"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr "Nastavení pro e-mail nemohou být odebrána dokud s k nim váží pověření."
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr "Čeká se na Kolab, až odebere nastavení e-mailu…"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr "Nejprve prosím odeberte nastavené e-mailu!"
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Zapnout zjišťování předávajícího stroje pomocí MX záznamu"
@@ -205,158 +360,3 @@ msgstr "název stroje"
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Chyba LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr "Neurčeno"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Zprávy"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Úkoly"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Deníky"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Kalendář"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Poznámky"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Příchozí"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Rozepsané"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Odeslané"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "Nevyžádaná pošta"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr "Výchozí"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Nastavení pro e-mail nemohou být odebrána dokud s k nim váží pověření."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Čeká se na Kolab, až odebere nastavení e-mailu…"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Nejprve prosím odeberte nastavené e-mailu!"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr "Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr "Nastavení účtu v Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr "Účet v Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Pověření"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "datový objem zprávy"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "u tohoto účtu není omezen datový objem zprávy"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "informace o Free/Busy"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL adresa"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Budoucí"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "dny"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr "Pravidla pro pozvánky"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr "Výchozí zásada"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr "Výchozí pravidla pozvánek"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Ruční"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Vždy přijmout"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "vždy odmítnout"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Odmítnout, pokud je v konfliktu"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "zeptat se, pokud je v konfliktu"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr "e-mailová adresa"
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "Sada pravidel pro tuto e-mailovou adresu"
diff --git a/kolab2/locale/de/fusiondirectory.po b/kolab2/locale/de/fusiondirectory.po
index ebcfc0c692..4a9237447d 100644
--- a/kolab2/locale/de/fusiondirectory.po
+++ b/kolab2/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,161 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr "Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr "Kolab-2-Kontoeinstellungen"
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr "Kolab-2-Konto"
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr "Stellvertreter"
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "Mailgröße"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "Keine Beschränkung der Mailgröße für dieses Konto"
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr "Frei/Belegt-Information"
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "Zukunft"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "Tage"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr "Einladungs-Richtlinie"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr "Standard Policy"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr "Standard Einladungs-Policy"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr "Manuell"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "Immer annehmen"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "Immer ablehnen"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "Im Konfliktfall ablehnen"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr "Im Konfliktfall manuell bearbeiten"
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr "Mailadresse"
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr "Policy für diese Mailadresse"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr "Nicht angegeben"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr "Mails"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr "Journal"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr "Kalendar"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr "Notizen"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr "Posteingang"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr "Entwürfe"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr "Gesendet"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr "Werbung"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr "Vorgabe"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr "Die Mail-Einstellungen können nicht entfernt werden solange Vertretungen vorhanden sind!"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr "Warte darauf, daß Kolab die Mail-Einstellungen entfernt..."
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr "Bitte entfernen Sie zunächst die Mail-Einstellungen!"
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Aktiviere MX lookup für relayhost"
@@ -206,158 +361,3 @@ msgstr "Hostname"
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr "Nicht angegeben"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Mails"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Journal"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Kalendar"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notizen"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Posteingang"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Entwürfe"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Gesendet"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "Werbung"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr "Vorgabe"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Die Mail-Einstellungen können nicht entfernt werden solange Vertretungen vorhanden sind!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Warte darauf, daß Kolab die Mail-Einstellungen entfernt..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Bitte entfernen Sie zunächst die Mail-Einstellungen!"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr "Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr "Kolab-2-Kontoeinstellungen"
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr "Kolab-2-Konto"
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Stellvertreter"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Mailgröße"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Keine Beschränkung der Mailgröße für dieses Konto"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Frei/Belegt-Information"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Zukunft"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "Tage"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr "Einladungs-Richtlinie"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr "Standard Policy"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr "Standard Einladungs-Policy"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Manuell"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Immer annehmen"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Immer ablehnen"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Im Konfliktfall ablehnen"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Im Konfliktfall manuell bearbeiten"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr "Mailadresse"
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "Policy für diese Mailadresse"
diff --git a/kolab2/locale/el_GR/fusiondirectory.po b/kolab2/locale/el_GR/fusiondirectory.po
index 2aea6898b5..6f40e09c39 100644
--- a/kolab2/locale/el_GR/fusiondirectory.po
+++ b/kolab2/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,161 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr "Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr "Ρυθμίσεις λογαριασμού Kolab 2 "
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr "Λογαριασμός Kolab 2 "
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr "Υποψηφιότητες"
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "Μέγεθος αλληλογραφίας"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "Χωρίς περιορισμό μεγέθους αλληλογραφίας για το λογαριασμό"
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr "Πληροφορία διαθεσιμότητας"
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "Μελλοντικές"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "ημέρες"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr "Πολιτική προσκλήσεων"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr "Προεπιλεγμένη πολιτική"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr "Προεπιλεγμένη πολιτική πρόσκλησης"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr "Χειροκίνητα"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "Πάντα αποδοχή"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "Πάντα απόρριψη"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "Απόρριψη αν υπάρχει σύγκρουση"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr "Χειροκίνητη ρύθμιση αν υπάρχει σύγκρουση"
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr "διεύθυνση e-mail "
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr "πολιτική για αυτήν την διεύθυνση e-mail "
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr "Ακαθόριστο"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr "Αλληλογραφία"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr "Εργασίες"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr "Δημοσιεύσεις"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr "Ημερολόγιο"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr "Επαφές"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr "Σημειώσεις"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr "Εισερχόμενα"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr "Πρόχειρα"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr "Απεσταλμένα"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr "Προεπιλογή"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr "Αναμονή για απομάκρυνση ιδιοτήτων αλληογραφίας από το kolab"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Ενεργοποίηση MX lookup για relayhost"
@@ -206,158 +361,3 @@ msgstr "όνομα συστήματος"
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr "Ακαθόριστο"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Αλληλογραφία"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Εργασίες"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Δημοσιεύσεις"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Ημερολόγιο"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Επαφές"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Σημειώσεις"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Εισερχόμενα"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Πρόχειρα"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Απεσταλμένα"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr "Προεπιλογή"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Αναμονή για απομάκρυνση ιδιοτήτων αλληογραφίας από το kolab"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr "Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr "Ρυθμίσεις λογαριασμού Kolab 2 "
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr "Λογαριασμός Kolab 2 "
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Υποψηφιότητες"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Μέγεθος αλληλογραφίας"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Χωρίς περιορισμό μεγέθους αλληλογραφίας για το λογαριασμό"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Πληροφορία διαθεσιμότητας"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Μελλοντικές"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "ημέρες"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr "Πολιτική προσκλήσεων"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr "Προεπιλεγμένη πολιτική"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr "Προεπιλεγμένη πολιτική πρόσκλησης"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Χειροκίνητα"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Πάντα αποδοχή"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Πάντα απόρριψη"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Απόρριψη αν υπάρχει σύγκρουση"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Χειροκίνητη ρύθμιση αν υπάρχει σύγκρουση"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr "διεύθυνση e-mail "
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "πολιτική για αυτήν την διεύθυνση e-mail "
diff --git a/kolab2/locale/es/fusiondirectory.po b/kolab2/locale/es/fusiondirectory.po
index c71ac306c7..5ba2fd4e44 100644
--- a/kolab2/locale/es/fusiondirectory.po
+++ b/kolab2/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr "Delegaciones"
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "Tamaño del correo electrónico"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "No hay restricción de correo para esta cuenta."
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr "Información de estado de presencia"
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "Futuro"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "días"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr "Política de invitación"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr "Manual"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "Aceptar siempre"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "Denegar siempre"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "Denegar si hay conflictos"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr "Preguntar si hay conflictos"
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr "Sin definir"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr "Correos"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr "Tareas"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr "Diario"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr "Calendario"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr "Contactos"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr "Notas"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr "Correo Entrante"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr "Borrador"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr "Enviar"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr "SPAM"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr "Por defecto"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr "¡Las características de correo no pueden ser eliminadas mientras haya delegaciones configuradas!"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr "Esperando que Kolab elimine las características de correo..."
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr "¡Por favor elimine las características de correo primero!"
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Permitir búsquedas MX para los relayhost"
@@ -205,158 +360,3 @@ msgstr "nombre de Maquina"
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Error LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr "Sin definir"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Correos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Tareas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Diario"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Calendario"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Contactos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Correo Entrante"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Borrador"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Enviar"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "SPAM"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr "Por defecto"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "¡Las características de correo no pueden ser eliminadas mientras haya delegaciones configuradas!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Esperando que Kolab elimine las características de correo..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "¡Por favor elimine las características de correo primero!"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Delegaciones"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Tamaño del correo electrónico"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "No hay restricción de correo para esta cuenta."
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Información de estado de presencia"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Futuro"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "días"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr "Política de invitación"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Manual"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Aceptar siempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Denegar siempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Denegar si hay conflictos"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Preguntar si hay conflictos"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/es_CO/fusiondirectory.po b/kolab2/locale/es_CO/fusiondirectory.po
index d08f50c1bf..75b225b2ba 100644
--- a/kolab2/locale/es_CO/fusiondirectory.po
+++ b/kolab2/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "días"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Error LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "días"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/es_VE/fusiondirectory.po b/kolab2/locale/es_VE/fusiondirectory.po
index 1a9cb1de21..5c3ab1c318 100644
--- a/kolab2/locale/es_VE/fusiondirectory.po
+++ b/kolab2/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr "Delegaciones"
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "Tamaño del correo electrónico"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "No hay restricción de correo para esta cuenta."
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr "Información de estado de presencia"
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "Futuro"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "días"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr "Política de invitación"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr "Manual"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "Aceptar siempre"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "Denegar siempre"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "Denegar si hay conflictos"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr "Preguntar si hay conflictos"
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr "Sin definir"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr "Correos"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr "Tareas"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr "Diario"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr "Calendario"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr "Contactos"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr "Notas"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr "Correo Entrante"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr "Borrador"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr "Enviar"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr "SPAM"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr "Por defecto"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr "¡Las características de correo no pueden ser eliminadas mientras haya delegaciones configuradas!"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr "Esperando que Kolab elimine las características de correo..."
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr "¡Por favor elimine las características de correo primero!"
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Permitir búsquedas MX para los relayhost"
@@ -205,158 +360,3 @@ msgstr "nombre de Maquina"
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Error de LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr "Sin definir"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Correos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Tareas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Diario"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Calendario"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Contactos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Correo Entrante"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Borrador"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Enviar"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "SPAM"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr "Por defecto"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "¡Las características de correo no pueden ser eliminadas mientras haya delegaciones configuradas!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Esperando que Kolab elimine las características de correo..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "¡Por favor elimine las características de correo primero!"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Delegaciones"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Tamaño del correo electrónico"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "No hay restricción de correo para esta cuenta."
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Información de estado de presencia"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Futuro"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "días"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr "Política de invitación"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Manual"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Aceptar siempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Denegar siempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Denegar si hay conflictos"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Preguntar si hay conflictos"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/fa_IR/fusiondirectory.po b/kolab2/locale/fa_IR/fusiondirectory.po
index 294b478ace..65f6b361ba 100644
--- a/kolab2/locale/fa_IR/fusiondirectory.po
+++ b/kolab2/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "خطای LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/fi_FI/fusiondirectory.po b/kolab2/locale/fi_FI/fusiondirectory.po
index 9682e3f491..cba18c0a9c 100644
--- a/kolab2/locale/fi_FI/fusiondirectory.po
+++ b/kolab2/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:47+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "LDAP virhe"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/fr/fusiondirectory.po b/kolab2/locale/fr/fusiondirectory.po
index 409b99b6fc..4a23bbc5f2 100644
--- a/kolab2/locale/fr/fusiondirectory.po
+++ b/kolab2/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -19,6 +19,161 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr "Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr "Paramètres du compte Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr "Compte Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr "Délégations"
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "Quota de courriel"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "Pas de taille maximale d’envoi de courriel pour ce compte"
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr "Information Free/Busy"
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "Futur"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "jours"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr "Politique d'invitation"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr "Politique par défaut"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr "Politique d’invitation par défaut"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr "Manuel"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "Toujours accepter"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "Toujours rejeter"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "Rejeter si il y a conflit"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr "Manuel si il y a conflit"
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr "adresse de courriel"
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr "politique pour cette adresse de courriel"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr "Non spécifié"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr "Courriels"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr "Tâches"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr "Journaux"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr "Calendrier"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr "Contacts"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr "Notes"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr "Boite de réception"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr "Brouillons"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr "Messages Envoyés"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr "SPAM"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr "Défaut"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr "Les paramètres de courriel ne peuvent pas être supprimés quand des délégations sont configurées !"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr "En attente de kolab pour la suppression des paramètres de courriel..."
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr "Veuillez d'abord supprimer les paramètres de courriel !"
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Activer la recherche MX pour le serveur relais"
@@ -207,158 +362,3 @@ msgstr "Nom d'hôte"
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Erreur LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr "Non spécifié"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Courriels"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Tâches"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Journaux"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Calendrier"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Contacts"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notes"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Boite de réception"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Brouillons"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Messages Envoyés"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "SPAM"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr "Défaut"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Les paramètres de courriel ne peuvent pas être supprimés quand des délégations sont configurées !"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "En attente de kolab pour la suppression des paramètres de courriel..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Veuillez d'abord supprimer les paramètres de courriel !"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr "Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr "Paramètres du compte Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr "Compte Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Délégations"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Quota de courriel"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Pas de taille maximale d’envoi de courriel pour ce compte"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Information Free/Busy"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Futur"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "jours"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr "Politique d'invitation"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr "Politique par défaut"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr "Politique d’invitation par défaut"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Manuel"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Toujours accepter"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Toujours rejeter"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Rejeter si il y a conflit"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Manuel si il y a conflit"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr "adresse de courriel"
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "politique pour cette adresse de courriel"
diff --git a/kolab2/locale/hu_HU/fusiondirectory.po b/kolab2/locale/hu_HU/fusiondirectory.po
index a6c641ce17..a95800d626 100644
--- a/kolab2/locale/hu_HU/fusiondirectory.po
+++ b/kolab2/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/id/fusiondirectory.po b/kolab2/locale/id/fusiondirectory.po
index f91264035f..2cb4bb4f0f 100644
--- a/kolab2/locale/id/fusiondirectory.po
+++ b/kolab2/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/it_IT/fusiondirectory.po b/kolab2/locale/it_IT/fusiondirectory.po
index 6392c4fa1a..62e1d7fb7b 100644
--- a/kolab2/locale/it_IT/fusiondirectory.po
+++ b/kolab2/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:24+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,6 +19,161 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr "Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr "Impostazioni account Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr "Account Kolab 2"
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr "Deleghe"
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "Quota della  posta elettronica"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "Nessuna restrizione di dimensione delle mail per questo account"
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr "Informazioni di disponibilità"
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "Futuro"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "giorni"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr "Politica d'invito"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr "Politica predefinita"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr "Politica d'invito predefinita"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr "Manualmente"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "Accetta sempre"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "Rifiuta sempre"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "Rifiuta se ci sono conflitti"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr "Manualmente se ci sono dei conflitti"
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr "Indirizzo mail"
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr "politica per questo indirizzo mail"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr "Non specificato"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr "Posta elettronica"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr "Compiti"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr "Giornali"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr "Calendario"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr "Agenda dei contatti"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr "Note"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr "Posta in arrivo"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr "Bozze"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr "Messaggi inviati"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr "Spam"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr "Default"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr "Impostazioni mail non possono essere rimosse mentre ci sono delle deleghe configurate!"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr "In attesa di Kolab per la rimozione dei parametri di posta elettronica"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr "Rimuovi prima i parametri della posta elettronica !"
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Verifica del record MX per il server relayhost"
@@ -207,158 +362,3 @@ msgstr "Nome dell'host"
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Errore LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr "Non specificato"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Posta elettronica"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Compiti"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Giornali"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Calendario"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Agenda dei contatti"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Note"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Posta in arrivo"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Bozze"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Messaggi inviati"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "Spam"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr "Default"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Impostazioni mail non possono essere rimosse mentre ci sono delle deleghe configurate!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "In attesa di Kolab per la rimozione dei parametri di posta elettronica"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Rimuovi prima i parametri della posta elettronica !"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr "Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr "Impostazioni account Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr "Account Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Deleghe"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Quota della  posta elettronica"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Nessuna restrizione di dimensione delle mail per questo account"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Informazioni di disponibilità"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Futuro"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "giorni"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr "Politica d'invito"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr "Politica predefinita"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr "Politica d'invito predefinita"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Manualmente"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Accetta sempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Rifiuta sempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Rifiuta se ci sono conflitti"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Manualmente se ci sono dei conflitti"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr "Indirizzo mail"
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "politica per questo indirizzo mail"
diff --git a/kolab2/locale/lv/fusiondirectory.po b/kolab2/locale/lv/fusiondirectory.po
index 9ff65611c4..538b349f84 100644
--- a/kolab2/locale/lv/fusiondirectory.po
+++ b/kolab2/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "LDAP kļūda"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/nb/fusiondirectory.po b/kolab2/locale/nb/fusiondirectory.po
index 8fb48e861b..cb22913671 100644
--- a/kolab2/locale/nb/fusiondirectory.po
+++ b/kolab2/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "LDAP-feil"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/nl/fusiondirectory.po b/kolab2/locale/nl/fusiondirectory.po
index d23ef4cdb7..979d2e36d9 100644
--- a/kolab2/locale/nl/fusiondirectory.po
+++ b/kolab2/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr "Delegaties"
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "E-mail grootte"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "Geen E-mail grootte restrictie voor dit account"
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr "Free Busy informatie"
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "Toekomstig"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "dagen"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr "Uitnodigingsbeleid"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr "Handmatig"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "Altijd accepteren"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "Altijd afwijzen"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "Afwijzen bij conflicten"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr "Handmatig bij conflicten"
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr "Niet opgegeven"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr "Mails"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr "Taken"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr "Kranten"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr "Kalender"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr "Contacten"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr "Notas"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr "Inbox"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr "Klad"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr "Verstuurd"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr "SPAM"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr "Standaard"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr "Mail-instellingen kunnen niet worden verwijderd, terwijl er geconfigureerd delegaties zijn!"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr "Wachten op kolab om e-mail eigenschappen te verwijderen ..."
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr "Gelieve eerst de e-mail instellingen te verwijderen!"
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Sta MX record opzoeken voor relayhost toe"
@@ -205,158 +360,3 @@ msgstr "hostname"
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "LDAP fout"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr "Niet opgegeven"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Mails"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Taken"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Kranten"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Kalender"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Contacten"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Inbox"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Klad"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Verstuurd"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "SPAM"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr "Standaard"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Mail-instellingen kunnen niet worden verwijderd, terwijl er geconfigureerd delegaties zijn!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Wachten op kolab om e-mail eigenschappen te verwijderen ..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Gelieve eerst de e-mail instellingen te verwijderen!"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Delegaties"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "E-mail grootte"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Geen E-mail grootte restrictie voor dit account"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Free Busy informatie"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Toekomstig"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "dagen"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr "Uitnodigingsbeleid"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Handmatig"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Altijd accepteren"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Altijd afwijzen"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Afwijzen bij conflicten"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Handmatig bij conflicten"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/pl/fusiondirectory.po b/kolab2/locale/pl/fusiondirectory.po
index 6955f9bd6d..f607d7836e 100644
--- a/kolab2/locale/pl/fusiondirectory.po
+++ b/kolab2/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr "Delegacje"
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "Rozmiar poczty"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "Brak ograniczeń co do wielkości poczty dla tego konta"
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr "Informacja FreeBusy"
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "Przyszłość"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "dni"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr "Polityka zapraszania"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr "Ręczne"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "Zawsze akceptuj"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "Zawsze odrzuć"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "Odmów jeśli koliduje"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr "Ustaw ręcznie jeśli koliduje"
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Włącz sprawdzanie MX dla relayhosta"
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "błąd LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Delegacje"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Rozmiar poczty"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Brak ograniczeń co do wielkości poczty dla tego konta"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Informacja FreeBusy"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Przyszłość"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "dni"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr "Polityka zapraszania"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Ręczne"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Zawsze akceptuj"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Zawsze odrzuć"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Odmów jeśli koliduje"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Ustaw ręcznie jeśli koliduje"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/pt/fusiondirectory.po b/kolab2/locale/pt/fusiondirectory.po
index feaf14b2e5..3739b4b1db 100644
--- a/kolab2/locale/pt/fusiondirectory.po
+++ b/kolab2/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Erro de LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/pt_BR/fusiondirectory.po b/kolab2/locale/pt_BR/fusiondirectory.po
index 940118f745..055fce03e7 100644
--- a/kolab2/locale/pt_BR/fusiondirectory.po
+++ b/kolab2/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "Tamanho de correio"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "Sem restrição de tamanho de correio para esta conta"
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "Futuro"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "dias"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "Sempre aceitar"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "Sempre recusar"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "Recusar se houver conflito"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr "endereço de correio"
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr "políticas para este endereço de correio"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr "Sem especificação"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr "Correios"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr "Calendário"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr "Contatos"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr "Notas"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr "Caixa de entrada"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr "Rascunhos"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr "Enviados"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr "SPAM"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr "Padrão"
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr "Aguardando Kolab remover propriedades de correio..."
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr "Por favor, remova configurações de correio antes!"
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Erro de LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr "Sem especificação"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Correios"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Calendário"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Contatos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Rascunhos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Enviados"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "SPAM"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr "Padrão"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Aguardando Kolab remover propriedades de correio..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Por favor, remova configurações de correio antes!"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Tamanho de correio"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Sem restrição de tamanho de correio para esta conta"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Futuro"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "dias"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Sempre aceitar"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Sempre recusar"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Recusar se houver conflito"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr "endereço de correio"
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "políticas para este endereço de correio"
diff --git a/kolab2/locale/ru/fusiondirectory.po b/kolab2/locale/ru/fusiondirectory.po
index 4676eb87b7..9dd761c740 100644
--- a/kolab2/locale/ru/fusiondirectory.po
+++ b/kolab2/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "дни"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "дни"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/ru@petr1708/fusiondirectory.po b/kolab2/locale/ru@petr1708/fusiondirectory.po
index 12ef197391..992fe5af8b 100644
--- a/kolab2/locale/ru@petr1708/fusiondirectory.po
+++ b/kolab2/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/sv/fusiondirectory.po b/kolab2/locale/sv/fusiondirectory.po
index 433abc8880..8b1b4b82cd 100644
--- a/kolab2/locale/sv/fusiondirectory.po
+++ b/kolab2/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "LDAP-fel"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/ug/fusiondirectory.po b/kolab2/locale/ug/fusiondirectory.po
index e234079055..5c09b61a52 100644
--- a/kolab2/locale/ug/fusiondirectory.po
+++ b/kolab2/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/vi_VN/fusiondirectory.po b/kolab2/locale/vi_VN/fusiondirectory.po
index 97acf1fdb9..658ab5c76a 100644
--- a/kolab2/locale/vi_VN/fusiondirectory.po
+++ b/kolab2/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/kolab2/locale/zh/fusiondirectory.po b/kolab2/locale/zh/fusiondirectory.po
index 81430bb5c8..dfadb343fe 100644
--- a/kolab2/locale/zh/fusiondirectory.po
+++ b/kolab2/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-05-12 13:36+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,161 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/kolab2/class_kolabAccount.inc:82
+msgid "Kolab 2"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:83
+msgid "Kolab 2 account settings"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:100
+msgid "Kolab 2 account"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr "代理人"
+
+#: personal/kolab2/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr "邮件大小"
+
+#: personal/kolab2/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr "该账号邮件大小不受限制"
+
+#: personal/kolab2/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr "自由使用的信息"
+
+#: personal/kolab2/class_kolabAccount.inc:125
+msgid "URL"
+msgstr "URL"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "Future"
+msgstr "功能"
+
+#: personal/kolab2/class_kolabAccount.inc:130
+msgid "days"
+msgstr "天"
+
+#: personal/kolab2/class_kolabAccount.inc:138
+#: personal/kolab2/class_kolabAccount.inc:141
+#: personal/kolab2/class_kolabAccount.inc:149
+#: personal/kolab2/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr "邀请策略"
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr "手工解决"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr "总是接受"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr "总是拒绝"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr "如果冲突拒绝"
+
+#: personal/kolab2/class_kolabAccount.inc:146
+#: personal/kolab2/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr "如果冲突手工解决"
+
+#: personal/kolab2/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab2/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
+msgid "Please remove the mail settings first!"
+msgstr ""
+
 #: admin/systems/services/kolab2/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "启用中继主机的 MX 查找"
@@ -205,158 +360,3 @@ msgstr ""
 #: admin/systems/services/kolab2/class_serviceKolab.inc:295
 msgid "LDAP error"
 msgstr "LDAP 错误"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:146
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:154
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:155
-msgid "Unspecified"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:161
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:162
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:163
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:164
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:165
-msgid "Default"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "代理人"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "邮件大小"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "该账号邮件大小不受限制"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "自由使用的信息"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "功能"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "天"
-
-#: personal/kolab2/class_kolabAccount.inc:138
-#: personal/kolab2/class_kolabAccount.inc:141
-#: personal/kolab2/class_kolabAccount.inc:149
-#: personal/kolab2/class_kolabAccount.inc:159
-msgid "Invitation policy"
-msgstr "邀请策略"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "手工解决"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "总是接受"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "总是拒绝"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "如果冲突拒绝"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "如果冲突手工解决"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr ""
diff --git a/ldapdump/locale/ar/fusiondirectory.po b/ldapdump/locale/ar/fusiondirectory.po
index aecf429273..b2e4b03c65 100644
--- a/ldapdump/locale/ar/fusiondirectory.po
+++ b/ldapdump/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/ldapdump/locale/ca/fusiondirectory.po b/ldapdump/locale/ca/fusiondirectory.po
index c407d7a4c2..b1525125ac 100644
--- a/ldapdump/locale/ca/fusiondirectory.po
+++ b/ldapdump/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/ldapdump/locale/cs_CZ/fusiondirectory.po b/ldapdump/locale/cs_CZ/fusiondirectory.po
index 8bf09df6e9..9dc65e667e 100644
--- a/ldapdump/locale/cs_CZ/fusiondirectory.po
+++ b/ldapdump/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/ldapdump/locale/de/fusiondirectory.po b/ldapdump/locale/de/fusiondirectory.po
index 4a52eb662c..0fdbaf1341 100644
--- a/ldapdump/locale/de/fusiondirectory.po
+++ b/ldapdump/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/ldapdump/locale/el_GR/fusiondirectory.po b/ldapdump/locale/el_GR/fusiondirectory.po
index c6bdc46de5..26df525fda 100644
--- a/ldapdump/locale/el_GR/fusiondirectory.po
+++ b/ldapdump/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/ldapdump/locale/es/fusiondirectory.po b/ldapdump/locale/es/fusiondirectory.po
index 1b544d9d19..97aa7474e5 100644
--- a/ldapdump/locale/es/fusiondirectory.po
+++ b/ldapdump/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/ldapdump/locale/es_CO/fusiondirectory.po b/ldapdump/locale/es_CO/fusiondirectory.po
index b284ba7761..a0ce701383 100644
--- a/ldapdump/locale/es_CO/fusiondirectory.po
+++ b/ldapdump/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/ldapdump/locale/es_VE/fusiondirectory.po b/ldapdump/locale/es_VE/fusiondirectory.po
index 0e0362f278..1cba4739c1 100644
--- a/ldapdump/locale/es_VE/fusiondirectory.po
+++ b/ldapdump/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/ldapdump/locale/fa_IR/fusiondirectory.po b/ldapdump/locale/fa_IR/fusiondirectory.po
index fb4fd32a43..005258741d 100644
--- a/ldapdump/locale/fa_IR/fusiondirectory.po
+++ b/ldapdump/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/ldapdump/locale/fi_FI/fusiondirectory.po b/ldapdump/locale/fi_FI/fusiondirectory.po
index a77dc99a94..bcd7ce8dbc 100644
--- a/ldapdump/locale/fi_FI/fusiondirectory.po
+++ b/ldapdump/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/ldapdump/locale/fr/fusiondirectory.po b/ldapdump/locale/fr/fusiondirectory.po
index 9d883e7f8f..a50b0837d6 100644
--- a/ldapdump/locale/fr/fusiondirectory.po
+++ b/ldapdump/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/ldapdump/locale/hu_HU/fusiondirectory.po b/ldapdump/locale/hu_HU/fusiondirectory.po
index 91829bd084..1ce68ecf6f 100644
--- a/ldapdump/locale/hu_HU/fusiondirectory.po
+++ b/ldapdump/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/ldapdump/locale/id/fusiondirectory.po b/ldapdump/locale/id/fusiondirectory.po
index e6a1ac5f6b..efa38660fc 100644
--- a/ldapdump/locale/id/fusiondirectory.po
+++ b/ldapdump/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/ldapdump/locale/it_IT/fusiondirectory.po b/ldapdump/locale/it_IT/fusiondirectory.po
index 64f8e98b5b..21b079a5a0 100644
--- a/ldapdump/locale/it_IT/fusiondirectory.po
+++ b/ldapdump/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:24+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/ldapdump/locale/lv/fusiondirectory.po b/ldapdump/locale/lv/fusiondirectory.po
index 97b7c67e60..f4031a819b 100644
--- a/ldapdump/locale/lv/fusiondirectory.po
+++ b/ldapdump/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/ldapdump/locale/nb/fusiondirectory.po b/ldapdump/locale/nb/fusiondirectory.po
index 03df8dd004..8803889704 100644
--- a/ldapdump/locale/nb/fusiondirectory.po
+++ b/ldapdump/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/ldapdump/locale/nl/fusiondirectory.po b/ldapdump/locale/nl/fusiondirectory.po
index 3ec0fa0947..80cc2cab37 100644
--- a/ldapdump/locale/nl/fusiondirectory.po
+++ b/ldapdump/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/ldapdump/locale/pl/fusiondirectory.po b/ldapdump/locale/pl/fusiondirectory.po
index 12ae9568ae..38e8f27021 100644
--- a/ldapdump/locale/pl/fusiondirectory.po
+++ b/ldapdump/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/ldapdump/locale/pt/fusiondirectory.po b/ldapdump/locale/pt/fusiondirectory.po
index 8baa7d310f..50f3895ad6 100644
--- a/ldapdump/locale/pt/fusiondirectory.po
+++ b/ldapdump/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/ldapdump/locale/pt_BR/fusiondirectory.po b/ldapdump/locale/pt_BR/fusiondirectory.po
index 685442754b..db1379b4f8 100644
--- a/ldapdump/locale/pt_BR/fusiondirectory.po
+++ b/ldapdump/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/ldapdump/locale/ru/fusiondirectory.po b/ldapdump/locale/ru/fusiondirectory.po
index 1bb3a0d54b..b85e0585c2 100644
--- a/ldapdump/locale/ru/fusiondirectory.po
+++ b/ldapdump/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-08 19:09+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/ldapdump/locale/ru@petr1708/fusiondirectory.po b/ldapdump/locale/ru@petr1708/fusiondirectory.po
index 503baa4435..ed18ef5d02 100644
--- a/ldapdump/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapdump/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/ldapdump/locale/sv/fusiondirectory.po b/ldapdump/locale/sv/fusiondirectory.po
index 1c72481324..647eda2b40 100644
--- a/ldapdump/locale/sv/fusiondirectory.po
+++ b/ldapdump/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/ldapdump/locale/ug/fusiondirectory.po b/ldapdump/locale/ug/fusiondirectory.po
index 9d8d6a676d..d92c44c6db 100644
--- a/ldapdump/locale/ug/fusiondirectory.po
+++ b/ldapdump/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/ldapdump/locale/vi_VN/fusiondirectory.po b/ldapdump/locale/vi_VN/fusiondirectory.po
index 6e74c8a276..00ebfae358 100644
--- a/ldapdump/locale/vi_VN/fusiondirectory.po
+++ b/ldapdump/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/ldapdump/locale/zh/fusiondirectory.po b/ldapdump/locale/zh/fusiondirectory.po
index 0c91d710f2..b572353f62 100644
--- a/ldapdump/locale/zh/fusiondirectory.po
+++ b/ldapdump/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:48+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/ldapmanager/locale/ar/fusiondirectory.po b/ldapmanager/locale/ar/fusiondirectory.po
index 2066ebff9a..2b4941194c 100644
--- a/ldapmanager/locale/ar/fusiondirectory.po
+++ b/ldapmanager/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,195 +17,195 @@ 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"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "No such object %s!"
-msgstr ""
-
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
-#, php-format
-msgid "You have no permission to export %s!"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
-msgstr "خطأ"
-
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr "خطأ"
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/ca/fusiondirectory.po b/ldapmanager/locale/ca/fusiondirectory.po
index 64b678a860..7a196054d8 100644
--- a/ldapmanager/locale/ca/fusiondirectory.po
+++ b/ldapmanager/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
-msgstr ""
-
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
-msgstr "Error d'LDAP"
-
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
-msgstr "Error"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Èxit"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr "Error d'LDAP"
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Èxit"
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr "Error"
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/cs_CZ/fusiondirectory.po b/ldapmanager/locale/cs_CZ/fusiondirectory.po
index dfd4fdfdd3..6f6c1d785e 100644
--- a/ldapmanager/locale/cs_CZ/fusiondirectory.po
+++ b/ldapmanager/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,101 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
+msgstr "Import/export LDAP"
+
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
+msgstr "Umožňuje importovat či exportovat ldap strom"
+
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
+msgstr "správce LDAP"
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr "Import CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
+msgstr "Importovat csv data do ldap stromu"
+
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
+msgstr "Importovat CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
+msgstr "Typ objektu"
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
+msgstr "Typ objektů, které chcete importovat"
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
+msgstr "Å ablona"
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
+msgstr "Vyberte šablonu, kterou aplikovat na importované položky"
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
+msgstr "Soubor CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
+msgstr "Importovat CSV soubor do databáze LDAP"
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
+msgstr "Oddělovač"
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr "Znak sloužící jako oddělovač v CSV souboru"
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr "Neměnné hodnoty"
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr "Některé neměnné hodnoty které by se mohly hodit při vyplňování šablony."
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Import"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr "Vyplňování šablony"
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr "Vyberte přiřazení políček"
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Úspěch"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr "%d položek bylo úspěšně importováno"
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr "LDIF"
@@ -31,7 +126,7 @@ msgstr "Správce LDAP"
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Export"
 
@@ -51,163 +146,68 @@ msgstr "Filtr"
 msgid "Filter to use for selecting objects to export"
 msgstr "Filtr, který použít pro výběr objektů k exportu"
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr "Stáhnout si ve formátu ldiff úplný zachycený stav používaného LDAP adresáře tohoto základu"
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Exportovat úplný LDIF pro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr "Importovat LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr "Přepsat existující položky"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr "Odebrat z LDAP položky, které jsou navíc oproti tomu, co je v LDIF."
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr "Import LDIF souboru do této LDAP databáze. Mějte na paměti, že FusionDirectory nebude ověřovat vaše LDIF data, zda jsou vhodná pro FusionDirectory."
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Import"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr "Importovat LDIF soubor"
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Chyba LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr "Objekt %s neexistuje!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Chyba oprávnění"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Nejste oprávněni exportovat %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Chyba"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "Vytvoření ldap exportu se nezdařilo, chyba je v %s!"
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
-msgstr "Import/export LDAP"
-
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
-msgstr "Umožňuje importovat či exportovat ldap strom"
-
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
-msgstr "správce LDAP"
-
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
-msgstr "Import CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
-msgstr "Importovat csv data do ldap stromu"
-
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
-msgstr "Importovat CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
-msgstr "Typ objektu"
-
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
-msgstr "Typ objektů, které chcete importovat"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
-msgstr "Å ablona"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr "Vyberte šablonu, kterou aplikovat na importované položky"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr "Soubor CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr "Importovat CSV soubor do databáze LDAP"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr "Oddělovač"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr "Znak sloužící jako oddělovač v CSV souboru"
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr "Neměnné hodnoty"
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr "Některé neměnné hodnoty které by se mohly hodit při vyplňování šablony."
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr "Vyplňování šablony"
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr "Vyberte přiřazení políček"
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Úspěch"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr "%d položek bylo úspěšně importováno"
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/de/fusiondirectory.po b/ldapmanager/locale/de/fusiondirectory.po
index 090c834803..a588a4f585 100644
--- a/ldapmanager/locale/de/fusiondirectory.po
+++ b/ldapmanager/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,101 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
+msgstr "LDAP Import/Export"
+
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
+msgstr "Erlaubt das Importieren und Exportieren des LDAP-Baums"
+
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
+msgstr "LDAP-Manager"
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr "CSV-Import"
+
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
+msgstr "Import von CSV-Daten in den LDAP-Baum"
+
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
+msgstr "CSV importieren"
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
+msgstr "Objecttyp"
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
+msgstr "Vorlage"
+
+#: 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 "CSV-Datei"
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
+msgstr "Feldtrenner"
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr "Feste Werte"
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Importieren"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Erfolg"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr "%d Einträge erfolgreich importiert"
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr "LDIF"
@@ -32,7 +127,7 @@ msgstr "LDAP Manager"
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Export"
 
@@ -52,163 +147,68 @@ msgstr "Filter"
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Exportiere vollständige LDIF-Datei für"
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr "LDIF importieren"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr "Vorhandene Einträge überschreiben"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Importieren"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr "LDIF-Datei importieren"
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr "Objekt %s nicht gefunden!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Sie haben keine Berechtigung, um %s zu exportieren!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Fehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
-msgstr "LDAP Import/Export"
-
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
-msgstr "Erlaubt das Importieren und Exportieren des LDAP-Baums"
-
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
-msgstr "LDAP-Manager"
-
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
-msgstr "CSV-Import"
-
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
-msgstr "Import von CSV-Daten in den LDAP-Baum"
-
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
-msgstr "CSV importieren"
-
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
-msgstr "Objecttyp"
-
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
-msgstr "Vorlage"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr "CSV-Datei"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr "Feldtrenner"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr "Feste Werte"
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Erfolg"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr "%d Einträge erfolgreich importiert"
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/el_GR/fusiondirectory.po b/ldapmanager/locale/el_GR/fusiondirectory.po
index 2485c56295..74451cb11e 100644
--- a/ldapmanager/locale/el_GR/fusiondirectory.po
+++ b/ldapmanager/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,101 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
+msgstr "Εισαγωγής/εξαγωγή LDAP"
+
+#: 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 "Διαχειριστής Ldap"
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr "Εισαγωγή CSV "
+
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
+msgstr "Εισαγωγή δεδομένων csv στο δέντρο ldap"
+
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
+msgstr "Εισαγωγή CSV"
+
+#: 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 "Αρχείο CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
+msgstr "Εισαγωγή ενός αρχείου CSV στο LDAP σας"
+
+#: 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 "Χαρακτήρας που χρησιμοποιείται ως διαχωριστικό στο αρχείο CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr "Προκαθορισμένες τιμές"
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Εισαγωγή"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr "Γέμισμα προτύπων"
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr "Επιλογή συσχετισμών πεδίων"
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Επιτυχία"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr "Πετυχημένη εισαγωγή %d καταχωρήσεων"
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr "LDIF (*.ldi,*.ldif)"
@@ -32,7 +127,7 @@ msgstr "Διαχείριση LDAP"
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Εξαγωγή"
 
@@ -52,163 +147,68 @@ msgstr "Φίλτρο"
 msgid "Filter to use for selecting objects to export"
 msgstr "Φίλτρο που θα χρησιμοποιείται για την επιλογή αντικειμένων για εξαγωγή"
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Εξαγωγή πλήρους LDIF για"
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr "Εισαγωγή LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr "Αντικατάσταση υπάρχουσων καταχωρίσεων"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Εισαγωγή"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr "Εισαγωγή αρχείου LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr "Δεν υπάρχει τέτοιος αντικείμενο %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Σφάλμα άδειας"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Δεν έχετε άδεια για εξαγωγή %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "Αποτυχία δημιουργίας εξαγωγής ldap, το σφάλμα ήταν \"%s\"!"
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
-msgstr "Εισαγωγής/εξαγωγή LDAP"
-
-#: 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 "Διαχειριστής Ldap"
-
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
-msgstr "Εισαγωγή CSV "
-
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
-msgstr "Εισαγωγή δεδομένων csv στο δέντρο ldap"
-
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
-msgstr "Εισαγωγή CSV"
-
-#: 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:50
-msgid "Template"
-msgstr "Πρότυπο"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr "Επιλογή ενός προτύπου από το οποίο θα εφραμοστούν οι εισηγμένες καταχωρήσεις"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr "Αρχείο CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr "Εισαγωγή ενός αρχείου CSV στο LDAP σας"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr "Διαχωριστικό"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr "Χαρακτήρας που χρησιμοποιείται ως διαχωριστικό στο αρχείο CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr "Προκαθορισμένες τιμές"
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr "Γέμισμα προτύπων"
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr "Επιλογή συσχετισμών πεδίων"
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Επιτυχία"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr "Πετυχημένη εισαγωγή %d καταχωρήσεων"
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/es/fusiondirectory.po b/ldapmanager/locale/es/fusiondirectory.po
index ae31692423..cd7cd50360 100644
--- a/ldapmanager/locale/es/fusiondirectory.po
+++ b/ldapmanager/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,101 @@ msgstr ""
 "Language: es\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 "Administrador LDAP"
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr "Importar desde CSV"
+
+#: 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 "Plantilla"
+
+#: 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 "Separador"
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Importar"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Correcto"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr ""
@@ -31,7 +126,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Exportar"
 
@@ -51,163 +146,68 @@ msgstr "Filtro"
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Exportación del LDIF completada para"
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Importar"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr "No existe el objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "No tiene permiso para exportar %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
-#: 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 "Administrador LDAP"
-
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
-msgstr "Importar desde CSV"
-
-#: 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:50
-msgid "Template"
-msgstr "Plantilla"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr "Separador"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Correcto"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr ""
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/es_CO/fusiondirectory.po b/ldapmanager/locale/es_CO/fusiondirectory.po
index 432a1d9190..f0aa8fb592 100644
--- a/ldapmanager/locale/es_CO/fusiondirectory.po
+++ b/ldapmanager/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
-msgstr "Filtro"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
+msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
+msgstr "Plantilla"
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
-msgstr "Error de permisos"
-
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
-msgstr "Error"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Realizado con éxito"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
-msgstr ""
-
-#: 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"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
-msgstr "Plantilla"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
+msgstr "Filtro"
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr "Error LDAP"
+
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
+msgstr "Error de permisos"
+
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Realizado con éxito"
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr "Error"
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/es_VE/fusiondirectory.po b/ldapmanager/locale/es_VE/fusiondirectory.po
index 929aed488d..105201b81e 100644
--- a/ldapmanager/locale/es_VE/fusiondirectory.po
+++ b/ldapmanager/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,101 @@ msgstr ""
 "Language: es_VE\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 "Administrador LDAP"
+
+#: 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 "Plantilla"
+
+#: 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 "Separador"
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Importar"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Correcto"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr ""
@@ -31,7 +126,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Exportar"
 
@@ -51,163 +146,68 @@ msgstr "Filtro"
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Exportar  LDIF completo para"
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Importar"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr "No existe el objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "No tiene permiso para exportar %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
-#: 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 "Administrador LDAP"
-
-#: 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:50
-msgid "Template"
-msgstr "Plantilla"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr "Separador"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Correcto"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr ""
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/fa_IR/fusiondirectory.po b/ldapmanager/locale/fa_IR/fusiondirectory.po
index 8bd0c52709..20c95a3ea2 100644
--- a/ldapmanager/locale/fa_IR/fusiondirectory.po
+++ b/ldapmanager/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
-msgstr ""
-
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
-msgstr "خطای LDAP"
-
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
-msgstr "خطا"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr "خطای LDAP"
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr "خطا"
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/fi_FI/fusiondirectory.po b/ldapmanager/locale/fi_FI/fusiondirectory.po
index acbd59c7c5..78c3019bce 100644
--- a/ldapmanager/locale/fi_FI/fusiondirectory.po
+++ b/ldapmanager/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:49+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
-msgstr ""
-
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
-msgstr "LDAP virhe"
-
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
-msgstr "Virhe"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr "LDAP virhe"
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr "Virhe"
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/fr/fusiondirectory.po b/ldapmanager/locale/fr/fusiondirectory.po
index 32848cfcab..06e185da05 100644
--- a/ldapmanager/locale/fr/fusiondirectory.po
+++ b/ldapmanager/locale/fr/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 14:07+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -20,6 +20,101 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
+msgstr "Import/Export LDAP"
+
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
+msgstr "Permet d'importer ou exporter des parties de l’annuaire LDAP"
+
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
+msgstr "Gestion LDAP"
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr "Import CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
+msgstr "Importer des données CSV dans votre annuaire LDAP"
+
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
+msgstr "Import CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
+msgstr "Type d'objet"
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
+msgstr "Le type d'objet que vous voulez importer"
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
+msgstr "Modèle"
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
+msgstr "Sélectionnez un modèle a appliquer aux entrées importées"
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
+msgstr "Fichier CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
+msgstr "Importer un fichier CSV dans votre LDAP"
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
+msgstr "Séparateur"
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr "Caractère utilisé comme séparateur dans votre fichier CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr "Valeurs fixes"
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr "Certaines valeurs fixes que vous voulez utiliser dans le remplissage du modèle."
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Importer"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr "Remplissage du modèle"
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr "Sélectionnez l'association des champs"
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr "L'importation à échoué pour la ligne %d"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Succès"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr "%d entrées importées avec succès"
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr "LDIF"
@@ -34,7 +129,7 @@ msgstr "Gestion LDAP"
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Exporter"
 
@@ -54,163 +149,68 @@ msgstr "Filtre"
 msgid "Filter to use for selecting objects to export"
 msgstr "Filtre à utiliser pour sélectionner les objets à exporter"
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr "Télécharger un instantané complet de l'annuaire LDAP au format LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Exporter un LDIF complet pour "
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr "Import LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr "Écraser les entrées existantes"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr "Retirer les champs qui ne sont pas dans le LDIF de l'annuaire si ils existaient."
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr "Importer un fichier LDIF dans votre annuaire. Souvenez vous que FusionDirectory ne vérifiera pas si votre fichier est conforme aux besoins de FusionDirectory ."
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Importer"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr "Importer un fichier LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr "Objet '%s' non trouvé !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Erreur de permission"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Vous n'avez pas l'autorisation d'exporter '%s' !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Erreur"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "Échec de l’exportation de votre annuaire LDAP, l'erreur est '%s' !"
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
-msgstr "Import/Export LDAP"
-
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
-msgstr "Permet d'importer ou exporter des parties de l’annuaire LDAP"
-
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
-msgstr "Gestion LDAP"
-
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
-msgstr "Import CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
-msgstr "Importer des données CSV dans votre annuaire LDAP"
-
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
-msgstr "Import CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
-msgstr "Type d'objet"
-
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
-msgstr "Le type d'objet que vous voulez importer"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
-msgstr "Modèle"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr "Sélectionnez un modèle a appliquer aux entrées importées"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr "Fichier CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr "Importer un fichier CSV dans votre LDAP"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr "Séparateur"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr "Caractère utilisé comme séparateur dans votre fichier CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr "Valeurs fixes"
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr "Certaines valeurs fixes que vous voulez utiliser dans le remplissage du modèle."
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr "Remplissage du modèle"
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr "Sélectionnez l'association des champs"
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr "L'importation à échoué pour la ligne %d"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Succès"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr "%d entrées importées avec succès"
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/hu_HU/fusiondirectory.po b/ldapmanager/locale/hu_HU/fusiondirectory.po
index 18dfa4da87..5b49c0f27c 100644
--- a/ldapmanager/locale/hu_HU/fusiondirectory.po
+++ b/ldapmanager/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
-msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/id/fusiondirectory.po b/ldapmanager/locale/id/fusiondirectory.po
index ed4573658c..7794693add 100644
--- a/ldapmanager/locale/id/fusiondirectory.po
+++ b/ldapmanager/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
-msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/it_IT/fusiondirectory.po b/ldapmanager/locale/it_IT/fusiondirectory.po
index 9d03265b73..2da1804266 100644
--- a/ldapmanager/locale/it_IT/fusiondirectory.po
+++ b/ldapmanager/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:24+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -18,6 +18,101 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
+msgstr "LDAP importa/esporta"
+
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
+msgstr "Consente l'importazione o l' esportazione della struttura LDAP"
+
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
+msgstr "Amministratore LDAP"
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr "Importa dal formato CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
+msgstr "Importazione dei dati csv nel ramo LDAP"
+
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
+msgstr "Importa CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
+msgstr "Tipo di oggetto"
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
+msgstr "Tipo di oggetti che si desidera importare"
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
+msgstr "Modello"
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
+msgstr "Seleziona un modello da applicare per importare voci"
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
+msgstr "File CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
+msgstr "Importa file CSV nel tuo LDAP"
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
+msgstr "Separatore"
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr "Carateri utilizzati come separatore nel file CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr "Valori fissi"
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr "Alcuni valori fissi che potreste voler utilizzare nel riempimento del modello"
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Importa"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr "Riempimento dei modelli"
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr "Selezionare associazione di campi"
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr "Importazione non riuscita per la linea %d"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Completato"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr "%d di dati importati con successo"
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr "LDIF "
@@ -32,7 +127,7 @@ msgstr "Manager LDAP"
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Esporta"
 
@@ -52,163 +147,68 @@ msgstr "Filtro"
 msgid "Filter to use for selecting objects to export"
 msgstr "Filtro da utilizzare per selezionare gli oggetti da esportare"
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr "Scaricare uno snapshot completo del directory LDAP per questa base come ldif"
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Esporta un file completo LDIF per"
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr "Importa file LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr "Sovrascrivere voci esistenti"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr "Rimuovere i campi che non sono in LDIF dalle voci LDAP se fossero esistenti ."
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr "Importa un file LDIF nell'annuario LDAP. Ricorda che FusionDirectory non controllerà i vostri LDIF per la conformità FusionDirectory."
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Importa"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr "Importa file LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr "Nessun oggetto %s !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Errore d'autorizzazione"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Non hai il permesso di esportare %s !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Errore"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "Impossibile generare l'esportazione LDAP, errore '%s' !"
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
-msgstr "LDAP importa/esporta"
-
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
-msgstr "Consente l'importazione o l' esportazione della struttura LDAP"
-
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
-msgstr "Amministratore LDAP"
-
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
-msgstr "Importa dal formato CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
-msgstr "Importazione dei dati csv nel ramo LDAP"
-
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
-msgstr "Importa CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
-msgstr "Tipo di oggetto"
-
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
-msgstr "Tipo di oggetti che si desidera importare"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
-msgstr "Modello"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr "Seleziona un modello da applicare per importare voci"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr "File CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr "Importa file CSV nel tuo LDAP"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr "Separatore"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr "Carateri utilizzati come separatore nel file CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr "Valori fissi"
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr "Alcuni valori fissi che potreste voler utilizzare nel riempimento del modello"
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr "Riempimento dei modelli"
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr "Selezionare associazione di campi"
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr "Importazione non riuscita per la linea %d"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Completato"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr "%d di dati importati con successo"
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/lv/fusiondirectory.po b/ldapmanager/locale/lv/fusiondirectory.po
index acdf5ab4e2..2d20e627bf 100644
--- a/ldapmanager/locale/lv/fusiondirectory.po
+++ b/ldapmanager/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
-msgstr "Filtrs"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
+msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
-msgstr ""
-
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
-msgstr "LDAP kļūda"
-
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
-msgstr "Kļūda"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
+msgstr "Filtrs"
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr "LDAP kļūda"
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr "Kļūda"
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/nb/fusiondirectory.po b/ldapmanager/locale/nb/fusiondirectory.po
index 45a37219bb..c3af19317b 100644
--- a/ldapmanager/locale/nb/fusiondirectory.po
+++ b/ldapmanager/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
-msgstr "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
+msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
-msgstr ""
-
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
-msgstr "LDAP-feil"
-
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
-msgstr "Feil"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
+msgstr "Filter"
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr "LDAP-feil"
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr "Feil"
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/nl/fusiondirectory.po b/ldapmanager/locale/nl/fusiondirectory.po
index bedaf45277..e146b54dcb 100644
--- a/ldapmanager/locale/nl/fusiondirectory.po
+++ b/ldapmanager/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,101 @@ msgstr ""
 "Language: nl\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 "Ldap beheerder"
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr "CSV import"
+
+#: 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 "Sjabloon"
+
+#: 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 "Separator"
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Importeren"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Succes"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr ""
@@ -31,7 +126,7 @@ msgstr "LDAP beheerder"
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Exporteer"
 
@@ -51,163 +146,68 @@ msgstr "Filter"
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Exporteer een complete LDIF voor"
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Importeren"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr "Zo geen object %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Permissiefout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Je hebt geen rechten om te exporten %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Fout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
-#: 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 "Ldap beheerder"
-
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
-msgstr "CSV import"
-
-#: 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:50
-msgid "Template"
-msgstr "Sjabloon"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr "Separator"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Succes"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr ""
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/pl/fusiondirectory.po b/ldapmanager/locale/pl/fusiondirectory.po
index 17df4925f4..c6bb519cac 100644
--- a/ldapmanager/locale/pl/fusiondirectory.po
+++ b/ldapmanager/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,101 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: 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_csvimport.inc:29
+msgid "CSV import"
+msgstr "import CVS"
+
+#: 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 "Szablon"
+
+#: 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:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Import"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Powodzenie"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr ""
@@ -31,7 +126,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Export"
 
@@ -51,163 +146,68 @@ msgstr "Filtr"
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Eksportuj kompletny LDIF dla"
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Import"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Błąd"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
-#: 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_csvimport.inc:29
-msgid "CSV import"
-msgstr "import CVS"
-
-#: 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:50
-msgid "Template"
-msgstr "Szablon"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Powodzenie"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr ""
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/pt/fusiondirectory.po b/ldapmanager/locale/pt/fusiondirectory.po
index 4c18d59307..34a7d628cd 100644
--- a/ldapmanager/locale/pt/fusiondirectory.po
+++ b/ldapmanager/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
+msgstr "Modelo"
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
-msgstr ""
-
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
-msgstr "Erro"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Sucesso"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
-msgstr "Modelo"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Sucesso"
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr "Erro"
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/pt_BR/fusiondirectory.po b/ldapmanager/locale/pt_BR/fusiondirectory.po
index 8149aff1d7..b7ce3067f9 100644
--- a/ldapmanager/locale/pt_BR/fusiondirectory.po
+++ b/ldapmanager/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,101 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
+msgstr "Importar/Exportar LDAP"
+
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
+msgstr "Permite importação ou exportação da árvore ldap"
+
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
+msgstr "Gerenciamento Ldap"
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr "Importação CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
+msgstr "Importação de dados csv na árvore ldap"
+
+#: 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 "Modelo"
+
+#: 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:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Importar"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Sucesso"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr ""
@@ -31,7 +126,7 @@ msgstr "Gerenciador LDAP"
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Exportar"
 
@@ -51,163 +146,68 @@ msgstr "Filtro"
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Exportar LDIF completo para"
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Importar"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr "Não há esse objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Erro de permissão"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Você não tem permissão para exportar %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Erro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
-msgstr "Importar/Exportar LDAP"
-
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
-msgstr "Permite importação ou exportação da árvore ldap"
-
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
-msgstr "Gerenciamento Ldap"
-
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
-msgstr "Importação CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
-msgstr "Importação de dados csv na árvore ldap"
-
-#: 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:50
-msgid "Template"
-msgstr "Modelo"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Sucesso"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr ""
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/ru/fusiondirectory.po b/ldapmanager/locale/ru/fusiondirectory.po
index 3343d4ca33..d2e0609e4b 100644
--- a/ldapmanager/locale/ru/fusiondirectory.po
+++ b/ldapmanager/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-12 06:45+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -19,6 +19,101 @@ 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"
 
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
+msgstr "LDAP импорт/экспорт"
+
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
+msgstr "Разрешить импорт или экспорт ldap деревьев"
+
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr "Импорт CSV"
+
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
+msgstr "Импорт данных csv в дерево ldap"
+
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
+msgstr "Импорт CSV"
+
+#: 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 "CSV файл"
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
+msgstr "Импорт CSV фала в ваш LDAP"
+
+#: 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 "Символ используемый как разделитель в CSV файле"
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "Импортировать"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Успешно"
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr "Импорт удачно завершен для %d записей"
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr "LDIF"
@@ -33,7 +128,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "Экспорт"
 
@@ -53,163 +148,68 @@ msgstr "Фильтр"
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "Экспортировать полностью LDIF для"
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr "Импорт LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr "Переписать существующие записи"
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr "Импорт файла LDIF в ваш LDAP. Помните, что FusionDirectory не будет проверять ваши LDIF на совместимость с FusionDirectory. "
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "Импортировать"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr "Импорт, LDIF файл"
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Ошибка доступа"
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Ошибка"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
-msgstr "LDAP импорт/экспорт"
-
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
-msgstr "Разрешить импорт или экспорт ldap деревьев"
-
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
-msgstr "Импорт CSV"
-
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
-msgstr "Импорт данных csv в дерево ldap"
-
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
-msgstr "Импорт CSV"
-
-#: 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:50
-msgid "Template"
-msgstr "Шаблон"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr "Выберите шаблон, который будет применен к импортированным записям"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr "CSV файл"
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr "Импорт CSV фала в ваш LDAP"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr "Разделитель"
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr "Символ используемый как разделитель в CSV файле"
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Успешно"
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr "Импорт удачно завершен для %d записей"
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/ldapmanager/locale/ru@petr1708/fusiondirectory.po b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
index 86cee09e75..f779f460a5 100644
--- a/ldapmanager/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,195 +17,195 @@ 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"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
-msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/sv/fusiondirectory.po b/ldapmanager/locale/sv/fusiondirectory.po
index bd4e49035d..cd742b94f4 100644
--- a/ldapmanager/locale/sv/fusiondirectory.po
+++ b/ldapmanager/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
-msgstr "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
+msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
+msgstr "Mall"
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
-msgstr ""
-
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
-msgstr "LDAP-fel"
-
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
-msgstr "Rättighetsfel"
-
-#: addons/ldapmanager/class_ldapmanager.inc:174
-#, php-format
-msgid "You have no permission to export %s!"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
-msgstr "Fel"
-
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
-msgstr "Mall"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
+msgstr "Filter"
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr ""
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr "LDAP-fel"
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
-msgid "Import failed for line %d"
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
+msgstr "Rättighetsfel"
+
+#: addons/ldapmanager/class_ldapmanager.inc:175
+#, php-format
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr "Fel"
+
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/ug/fusiondirectory.po b/ldapmanager/locale/ug/fusiondirectory.po
index f17056381d..673a0476bc 100644
--- a/ldapmanager/locale/ug/fusiondirectory.po
+++ b/ldapmanager/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
-msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:112
+msgid ""
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/vi_VN/fusiondirectory.po b/ldapmanager/locale/vi_VN/fusiondirectory.po
index 2faba84ad6..d62b170383 100644
--- a/ldapmanager/locale/vi_VN/fusiondirectory.po
+++ b/ldapmanager/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,195 +17,195 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:45
-msgid "LDIF"
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
-msgid "Export/Import the ldap tree to/from LDIF format"
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:48
-msgid "LDAP Manager"
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
-msgid "Export"
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
-msgid "DN of a single entry to export as ldif"
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
-msgid "Export single entry"
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
-msgid "Filter to use for selecting objects to export"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
-msgid ""
-"Download a complete snapshot of the running LDAP directory for this base as "
-"ldif"
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
+msgstr "Mẫu"
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
-msgid "Export complete LDIF for"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
-msgid "Import LDIF"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid "Overwrite existing entries"
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
-msgid ""
-"Remove fields that are not in the LDIF from the LDAP entries if they were "
-"existing."
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
-"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
-"check your LDIFs for FusionDirectory conformance."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:125
-msgid "Import LDIF file"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
-msgid "LDAP error"
-msgstr "Lá»—i LDAP"
-
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#, php-format
-msgid "No such object %s!"
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
-msgid "Permission error"
-msgstr "Lỗi về cấp phép"
-
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
-msgid "You have no permission to export %s!"
+msgid "Import failed for line %d"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
-msgid "Error"
-msgstr "Lá»—i"
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr "Thành công"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
-msgid "Failed to generate ldap export, error was \"%s\"!"
-msgstr ""
-
-#: addons/ldapmanager/tabs_ldif.inc:31
-msgid "LDAP import/export"
+msgid "Successfully imported %d entries"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:32
-msgid "Allows the import or export of the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/tabs_ldif.inc:36
-msgid "Ldap manager"
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:29
-msgid "CSV import"
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:30
-msgid "Import of csv data into the ldap tree"
+#: addons/ldapmanager/class_ldapmanager.inc:62
+#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:95
+msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:43
-msgid "Import CSV"
+#: addons/ldapmanager/class_ldapmanager.inc:65
+msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Object type"
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:46
-msgid "Type of objects you wish to import"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Template"
-msgstr "Mẫu"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
+#: addons/ldapmanager/class_ldapmanager.inc:82
+msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:88
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
+#: addons/ldapmanager/class_ldapmanager.inc:99
+msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
+#: addons/ldapmanager/class_ldapmanager.inc:104
+msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
+#: addons/ldapmanager/class_ldapmanager.inc:107
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:64
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
+"Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
+"check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
+#: addons/ldapmanager/class_ldapmanager.inc:126
+msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr "Lá»—i LDAP"
+
+#: addons/ldapmanager/class_ldapmanager.inc:155
+#, php-format
+msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:236
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
+msgstr "Lỗi về cấp phép"
+
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
-msgid "Import failed for line %d"
+msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr "Thành công"
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr "Lá»—i"
 
-#: addons/ldapmanager/class_csvimport.inc:244
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
-msgid "Successfully imported %d entries"
+msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/zh/fusiondirectory.po b/ldapmanager/locale/zh/fusiondirectory.po
index b2666c3a91..e9780032e5 100644
--- a/ldapmanager/locale/zh/fusiondirectory.po
+++ b/ldapmanager/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-05 12:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,101 @@ msgstr ""
 "Language: zh\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_csvimport.inc:29
+msgid "CSV import"
+msgstr "CSV 导入"
+
+#: 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:69
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:69
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:78
+#: addons/ldapmanager/class_csvimport.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/contentcsv.tpl.c:26
+#: addons/ldapmanager/contentcsv.tpl.c:29
+msgid "Import"
+msgstr "导入"
+
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:94
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+msgid "Success"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:258
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
+
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr ""
@@ -31,7 +126,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:62
 #: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:94
+#: addons/ldapmanager/class_ldapmanager.inc:95
 msgid "Export"
 msgstr "导出"
 
@@ -51,163 +146,68 @@ msgstr "过滤器"
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:88
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:98
+#: addons/ldapmanager/class_ldapmanager.inc:99
 msgid "Export complete LDIF for"
 msgstr "导出整个 LDIF "
 
-#: addons/ldapmanager/class_ldapmanager.inc:103
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:106
+#: addons/ldapmanager/class_ldapmanager.inc:107
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:111
+#: addons/ldapmanager/class_ldapmanager.inc:112
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:121
-#: addons/ldapmanager/class_csvimport.inc:71
-#: addons/ldapmanager/class_csvimport.inc:94
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
-msgid "Import"
-msgstr "导入"
-
-#: addons/ldapmanager/class_ldapmanager.inc:125
+#: addons/ldapmanager/class_ldapmanager.inc:126
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:153
-#: addons/ldapmanager/class_ldapmanager.inc:197
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
+#: addons/ldapmanager/class_ldapmanager.inc:155
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:173
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:174
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:180
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "错误"
 
-#: addons/ldapmanager/class_ldapmanager.inc:181
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
 
-#: 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_csvimport.inc:29
-msgid "CSV import"
-msgstr "CSV 导入"
-
-#: 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:50
-msgid "Template"
-msgstr "模板"
-
-#: addons/ldapmanager/class_csvimport.inc:50
-msgid "Select a template to apply to imported entries"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:54
-msgid "Import a CSV file into your LDAP"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Separator"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:58
-msgid "Character used as separator in the CSV file"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid "Fixed values"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:64
-msgid ""
-"Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:76
-msgid "Template filling"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:85
-msgid "Select fields associations"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:236
-#, php-format
-msgid "Import failed for line %d"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-msgid "Success"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:244
-#, php-format
-msgid "Successfully imported %d entries"
-msgstr ""
-
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file"
diff --git a/mail/locale/ar/fusiondirectory.po b/mail/locale/ar/fusiondirectory.po
index 4c714c3227..2aabd1e3a1 100644
--- a/mail/locale/ar/fusiondirectory.po
+++ b/mail/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,101 +17,6 @@ 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/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "خادم"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "خدمات"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "خادم"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "خدمات"
diff --git a/mail/locale/ca/fusiondirectory.po b/mail/locale/ca/fusiondirectory.po
index 98c8ecf5d2..767a0ce100 100644
--- a/mail/locale/ca/fusiondirectory.po
+++ b/mail/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Error de la configuració"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Error de la configuració"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/cs_CZ/fusiondirectory.po b/mail/locale/cs_CZ/fusiondirectory.po
index 7126ef759b..ddfcff9b75 100644
--- a/mail/locale/cs_CZ/fusiondirectory.po
+++ b/mail/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "E-mail"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr "Předvolby skupinového e-mailu"
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informace"
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Hlavní adresa"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr "Hlavní e-mailová adresa"
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Server"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Serverová pošta"
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Alternativní adresy"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr "Alternativní e-mailové adresy této skupiny"
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Přeposlat zprávy těm, kdo nejsou členy skupiny"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr "Může přijímat pouze místní e-maily"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr "Zda je této e-mailové skupině omezeno přijímání zpráv pouze na ty od místních odesilatelů"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr "Obecná služba IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr "IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Služby"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Chyba v nastavení"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr "Nastavený atribut zprávy '%s' není podporován!"
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Neznámý systém správy e-mailů '%s'!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "žádné"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "neznámé"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr "Neomezené"
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr "Kvóta využití"
 msgid "Part of the quota which is used"
 msgstr "Část kvóty, která je využita"
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "E-mail"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr "Nastavení e-mailu"
 msgid "Mail account"
 msgstr "E-mailový účet"
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Hlavní adresa"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr "Hlavní e-mailová adresa"
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Server"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Zadejte poštovní server, na kterém bude uživatel mít svůj účet."
@@ -161,6 +82,11 @@ msgstr "Velikost kvóty"
 msgid "Other addresses and redirections"
 msgstr "Ostatní adresy a přesměrování"
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Alternativní adresy"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Seznam alternativních e-mailových adres"
@@ -250,6 +176,34 @@ msgstr "E-mailovou schránku se nedaří odebrat, nedaří se připojit metodou:
 msgid "Cannot remove mailbox: %s"
 msgstr "Nelze odebrat schárnku: %s"
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Chyba v nastavení"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr "Nastavený atribut zprávy '%s' není podporován!"
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr "Neznámý systém správy e-mailů '%s'!"
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "žádné"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "neznámé"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr "Neomezené"
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr "Nastavení zásuvného modulu E-mail"
@@ -322,3 +276,49 @@ msgstr "Sdílená předpona"
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr "Předpona, kterou přidat pro sdílené poštovní složky."
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr "Předvolby skupinového e-mailu"
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr "Informace"
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr "Hlavní e-mailová adresa"
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr "Serverová pošta"
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr "Alternativní e-mailové adresy této skupiny"
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Přeposlat zprávy těm, kdo nejsou členy skupiny"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr "Může přijímat pouze místní e-maily"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr "Zda je této e-mailové skupině omezeno přijímání zpráv pouze na ty od místních odesilatelů"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr "Obecná služba IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr "IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Služby"
diff --git a/mail/locale/de/fusiondirectory.po b/mail/locale/de/fusiondirectory.po
index e964e9c2ab..6f195b58dc 100644
--- a/mail/locale/de/fusiondirectory.po
+++ b/mail/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Mail"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr "Gruppenmailoptionen"
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informationen"
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Primäre Adresse"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr "Die primäre Mailadresse"
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Server"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Servermail"
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Alternative Adressen"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr "Alternative Mailadressen für die Gruppe"
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr "Generischer IMAP/POP3 Dienst"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr "IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Dienste"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Konfigurationsfehler"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr "Das eingestellte Mail-Attribut '%s' wird nicht unterstützt!"
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Mail-Methode '%s' ist unbekannt!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Keine"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr "Ohne Beschränkung"
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr "Kontingent-Nutzung"
 msgid "Part of the quota which is used"
 msgstr "Teil der verwendeten Quota"
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Mail"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr "Mail-Einstellungen"
 msgid "Mail account"
 msgstr "Mail-Konto"
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Primäre Adresse"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr "Primäre Mailadresse"
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Server"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Wählen Sie den Mail-Server, auf dem dieses Konto angelegt werden soll"
@@ -161,6 +82,11 @@ msgstr "Kontingent-Größe"
 msgid "Other addresses and redirections"
 msgstr "Weitere Adressen und Weiterleitungen"
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Alternative Adressen"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Liste alternativer Mail-Adressen"
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr "Kann das Postfach nicht entfernen: %s"
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Konfigurationsfehler"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr "Das eingestellte Mail-Attribut '%s' wird nicht unterstützt!"
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr "Mail-Methode '%s' ist unbekannt!"
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "Keine"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr "Ohne Beschränkung"
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr "Mailplugin-Konfiguration"
@@ -322,3 +276,49 @@ msgstr "Geteiltes Prefix"
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr "Hinzuzufügendes Prefix für Mail geteilter Ordner"
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr "Gruppenmailoptionen"
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr "Informationen"
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr "Die primäre Mailadresse"
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr "Servermail"
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr "Alternative Mailadressen für die Gruppe"
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr "Generischer IMAP/POP3 Dienst"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr "IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Dienste"
diff --git a/mail/locale/el_GR/fusiondirectory.po b/mail/locale/el_GR/fusiondirectory.po
index 7b98b0de6a..078c4f0cbf 100644
--- a/mail/locale/el_GR/fusiondirectory.po
+++ b/mail/locale/el_GR/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -20,101 +20,6 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Αλληλογραφία"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr "Επιλογές ομάδων αλληλογραφίας"
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Πληροφορίες"
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Κύρια διεύθυνση"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr "Κύρια διεύθυνση αλληλογραφίας"
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Διακομιστής"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Διακομιστής αλληλογραφίας"
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Εναλλακτικές διευθύνσεις"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr "Εναλλακτική διεύθυνση e-mail για αυτή την ομάδα"
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Προώθηση μηνυμάτων στα μη μέλη της ομάδας"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr "Επιτρέπεται να λαμβάνουν μόνο τοπική αλληλογραφία"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr "Αν επιτρέπεται σε αυτή την ομάδα να δέχεται μηνύματα από τοπικούς αποστολείς"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr "Υπηρεσία IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr "IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Υπηρεσίες"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Σφάλμα ρύθμισης"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Κανένα"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Άγνωστο"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr "Απεριόριστο"
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -139,6 +44,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Αλληλογραφία"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -148,10 +59,20 @@ msgstr "Ρυθμίσεις αλληλογραφίας"
 msgid "Mail account"
 msgstr "Λογαριασμός αλληλογραφίας"
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Κύρια διεύθυνση"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr "Κύρια διεύθυνση αλληλογραφίας"
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Διακομιστής"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -164,6 +85,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr "Άλλες διευθύνσεις και αναδρομολογήσεις"
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Εναλλακτικές διευθύνσεις"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Κατάλογος εναλλακτικών διευθύνσεvn και αναδρομολογήσεvn"
@@ -253,6 +179,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr "Αδυναμία διαγραφής γραμματοκιβωτίου: %s"
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Σφάλμα ρύθμισης"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "Κανένα"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Άγνωστο"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr "Απεριόριστο"
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr "Ρύθμιση προσθέτου αλληλογραφίας"
@@ -325,3 +279,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr "Επιλογές ομάδων αλληλογραφίας"
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr "Πληροφορίες"
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr "Κύρια διεύθυνση αλληλογραφίας"
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr "Διακομιστής αλληλογραφίας"
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr "Εναλλακτική διεύθυνση e-mail για αυτή την ομάδα"
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Προώθηση μηνυμάτων στα μη μέλη της ομάδας"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr "Επιτρέπεται να λαμβάνουν μόνο τοπική αλληλογραφία"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr "Αν επιτρέπεται σε αυτή την ομάδα να δέχεται μηνύματα από τοπικούς αποστολείς"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr "Υπηρεσία IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr "IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Υπηρεσίες"
diff --git a/mail/locale/es/fusiondirectory.po b/mail/locale/es/fusiondirectory.po
index 63282707d0..dafef33bdb 100644
--- a/mail/locale/es/fusiondirectory.po
+++ b/mail/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Correo Electrónico"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Cuenta Principal"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Servidor"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Direcciones alternativas"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Reenviar mensajes a miembros que no sean del grupo"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr "IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Servicios"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Error en la configuración"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr "¡El atributo '%s' configurado en el correo no esta soportado!"
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "¡El método de correo '%s' es desconocido!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Ninguno"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr "Sin limite"
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr "Uso de Cuota"
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Correo Electrónico"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr "Parámetros de correo"
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Cuenta Principal"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Servidor"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Especificar el servidor de correo donde el usuario estará hospedado."
@@ -161,6 +82,11 @@ msgstr "Tamaño de la cuota"
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Direcciones alternativas"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Error en la configuración"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr "¡El atributo '%s' configurado en el correo no esta soportado!"
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr "¡El método de correo '%s' es desconocido!"
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "Ninguno"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr "Sin limite"
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Reenviar mensajes a miembros que no sean del grupo"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr "IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Servicios"
diff --git a/mail/locale/es_CO/fusiondirectory.po b/mail/locale/es_CO/fusiondirectory.po
index 485a86495c..894fd15584 100644
--- a/mail/locale/es_CO/fusiondirectory.po
+++ b/mail/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Correo"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Datos"
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Error de configuración"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Ninguno"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Correo"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Error de configuración"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "Ninguno"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr "Datos"
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/es_VE/fusiondirectory.po b/mail/locale/es_VE/fusiondirectory.po
index 200e3af427..7f41adbb5e 100644
--- a/mail/locale/es_VE/fusiondirectory.po
+++ b/mail/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Correo Electrónico"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Cuenta Principal"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Servidor"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Direcciones alternativas"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Reenviar mensajes a miembros que no sean del grupo"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr "IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Servicios"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Error en la configuración"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr "¡El atributo '%s' configurado en el correo no esta soportado!"
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "¡El método de correo '%s' es desconocido!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Ninguno"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr "Sin limite"
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr "Uso de Cuota"
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Correo Electrónico"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr "Parámetros de correo"
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Cuenta Principal"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Servidor"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Especificar el servidor de correo donde el usuario estará hospedado."
@@ -161,6 +82,11 @@ msgstr "Tamaño de cuota"
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Direcciones alternativas"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr "No se puede eliminar el buzón: %s"
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Error en la configuración"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr "¡El atributo '%s' configurado en el correo no esta soportado!"
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr "¡El método de correo '%s' es desconocido!"
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "Ninguno"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr "Sin limite"
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Reenviar mensajes a miembros que no sean del grupo"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr "IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Servicios"
diff --git a/mail/locale/fa_IR/fusiondirectory.po b/mail/locale/fa_IR/fusiondirectory.po
index c46ae46b09..223e339087 100644
--- a/mail/locale/fa_IR/fusiondirectory.po
+++ b/mail/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/fi_FI/fusiondirectory.po b/mail/locale/fi_FI/fusiondirectory.po
index 65edcdd47c..4104248a7b 100644
--- a/mail/locale/fi_FI/fusiondirectory.po
+++ b/mail/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-14 18:38+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Palvelut"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Palvelut"
diff --git a/mail/locale/fr/fusiondirectory.po b/mail/locale/fr/fusiondirectory.po
index e4b08eb497..8821298036 100644
--- a/mail/locale/fr/fusiondirectory.po
+++ b/mail/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -19,101 +19,6 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Courriel"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr "Options de courriel du groupe"
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informations"
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Adresse principale"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr "Adresse de courriel principale"
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Serveur"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Serveur de courriel"
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Adresses alternatives"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr "Adresses de courriel alternatives pour le groupe"
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Transférer les messages vers des membres n'appartenant pas au groupe"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr "Les utilisateurs ne sont autorisés qu'à recevoir des messages locaux"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr "Ce groupe mail est uniquement autorisé à recevoir des messages provenant d'expéditeurs locaux"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr "Service IMAP/POP3 générique"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr "IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Services"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Erreur de configuration"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr "L'attribut de messagerie '%s' n'est pas supporté !"
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Le méthode de messagerie '%s' est inconnue !"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Aucun"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr "Illimité"
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -138,6 +43,12 @@ msgstr "Utilisation des quotas"
 msgid "Part of the quota which is used"
 msgstr "Part du quota qui est utilisée"
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Courriel"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -147,10 +58,20 @@ msgstr "Paramètres de courriel"
 msgid "Mail account"
 msgstr "Compte courriel"
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Adresse principale"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr "Adresse de courriel principale"
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Serveur"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Indiquez le serveur de courriel de l'utilisateur"
@@ -163,6 +84,11 @@ msgstr "Taille du quota"
 msgid "Other addresses and redirections"
 msgstr "Autres adresses et redirections"
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Adresses alternatives"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Liste des adresses de courriel alternatives"
@@ -252,6 +178,34 @@ msgstr "Impossible de supprimer le compte de messagerie, impossible de se connec
 msgid "Cannot remove mailbox: %s"
 msgstr "Impossible de supprimer le compte de messagerie : %s"
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Erreur de configuration"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr "L'attribut de messagerie '%s' n'est pas supporté !"
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr "Le méthode de messagerie '%s' est inconnue !"
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "Aucun"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr "Illimité"
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr "Configuration du plugin mail"
@@ -324,3 +278,49 @@ msgstr "Préfixe des dossiers partagés"
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr "Préfixe à ajouter pour les dossiers partagés."
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr "Options de courriel du groupe"
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr "Informations"
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr "Adresse de courriel principale"
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr "Serveur de courriel"
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr "Adresses de courriel alternatives pour le groupe"
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Transférer les messages vers des membres n'appartenant pas au groupe"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr "Les utilisateurs ne sont autorisés qu'à recevoir des messages locaux"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr "Ce groupe mail est uniquement autorisé à recevoir des messages provenant d'expéditeurs locaux"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr "Service IMAP/POP3 générique"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr "IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Services"
diff --git a/mail/locale/hu_HU/fusiondirectory.po b/mail/locale/hu_HU/fusiondirectory.po
index 1dd48c0d70..10621378fd 100644
--- a/mail/locale/hu_HU/fusiondirectory.po
+++ b/mail/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/id/fusiondirectory.po b/mail/locale/id/fusiondirectory.po
index 7ac78f8542..c6f8b59b87 100644
--- a/mail/locale/id/fusiondirectory.po
+++ b/mail/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/it_IT/fusiondirectory.po b/mail/locale/it_IT/fusiondirectory.po
index f1dcb0547c..02a57815f7 100644
--- a/mail/locale/it_IT/fusiondirectory.po
+++ b/mail/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:24+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,101 +19,6 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Mail"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr "Opzioni per le mail di gruppo"
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informazioni"
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Indirizzo principale"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr "Lindirizzo mail principale"
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Server"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Server di e-mail"
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Indirizzi alternativi"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr "Indirizzi e-mail alternativi per il gruppo"
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Inoltra i messaggi ai membri che non appartengono al gruppo"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr "L'utente è abilitato a ricevere solo messaggi locali"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr "Questo gruppo email e' autorizzato unicamente a ricevere messaggi da mittenti locali"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr "Servizio generico IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr "IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Servizi"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Errore di configurazione"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr "L'attributo mail '%s' non è supportato !"
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "L'algoritmo per la posta elettronica '%s' è sconosciuto !"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Nessuno"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr "Illimitato"
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -138,6 +43,12 @@ msgstr "Utilizzo della quota"
 msgid "Part of the quota which is used"
 msgstr "Parte della quota utilizzata"
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Mail"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -147,10 +58,20 @@ msgstr "Impostazioni della posta elettronica"
 msgid "Mail account"
 msgstr "Account email"
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Indirizzo principale"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr "Indirizzo mail principale"
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Server"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Specifica il server di posta elettronica che ospiterà l'account dell'utente"
@@ -163,6 +84,11 @@ msgstr "Dimensione della quota"
 msgid "Other addresses and redirections"
 msgstr "Altri indirizzi e redirezioni"
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Indirizzi alternativi"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Elenco degli indirizzi alternativi"
@@ -252,6 +178,34 @@ msgstr "Impossibile rimuovere la mailbox, il metodo di posta non riesce a connet
 msgid "Cannot remove mailbox: %s"
 msgstr "Impossibile rimuovere mailbox : %s"
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Errore di configurazione"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr "L'attributo mail '%s' non è supportato !"
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr "L'algoritmo per la posta elettronica '%s' è sconosciuto !"
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "Nessuno"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr "Illimitato"
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr "Configurazione de l plugin mail"
@@ -324,3 +278,49 @@ msgstr "Prefisso condiviso"
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr "Prefisso da aggiungere per cartelle mail condivise."
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr "Opzioni per le mail di gruppo"
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr "Informazioni"
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr "Lindirizzo mail principale"
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr "Server di e-mail"
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr "Indirizzi e-mail alternativi per il gruppo"
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Inoltra i messaggi ai membri che non appartengono al gruppo"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr "L'utente è abilitato a ricevere solo messaggi locali"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr "Questo gruppo email e' autorizzato unicamente a ricevere messaggi da mittenti locali"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr "Servizio generico IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr "IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Servizi"
diff --git a/mail/locale/lv/fusiondirectory.po b/mail/locale/lv/fusiondirectory.po
index 06a3104d19..c953445853 100644
--- a/mail/locale/lv/fusiondirectory.po
+++ b/mail/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Pasts"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr "Grupas pasta iespējas"
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Pasts"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr "Grupas pasta iespējas"
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/nb/fusiondirectory.po b/mail/locale/nb/fusiondirectory.po
index d8ef20b16f..a25ea1cf07 100644
--- a/mail/locale/nb/fusiondirectory.po
+++ b/mail/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Tjener"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Tjener"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/nl/fusiondirectory.po b/mail/locale/nl/fusiondirectory.po
index 8891ad05b6..1dcb2dbb60 100644
--- a/mail/locale/nl/fusiondirectory.po
+++ b/mail/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "E-mail"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informatie"
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Primair adres"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr "Het primaire email adres"
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Server"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Alternatieve adressen"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Stuur berichten door naar niet groepsleden"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr "IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Services"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Configuratie fout"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr "De geconfigureerde mail attribuut '%s' is niet ondersteund!"
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Mail methode '%s' is onbekend!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Geen"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr "Onbeperkt"
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr "Quota gebruik"
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "E-mail"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr "E-mail instellingen"
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Primair adres"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Server"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Specificeer de mailserver waarop het account opgeslagen wordt"
@@ -161,6 +82,11 @@ msgstr "Quota grootte"
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Alternatieve adressen"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Lijst met alternatieve E-mail adressen"
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr "Kan mailbox niet verwijderen : %s"
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Configuratie fout"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr "De geconfigureerde mail attribuut '%s' is niet ondersteund!"
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr "Mail methode '%s' is onbekend!"
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "Geen"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr "Onbeperkt"
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr "Informatie"
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr "Het primaire email adres"
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Stuur berichten door naar niet groepsleden"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr "IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Services"
diff --git a/mail/locale/pl/fusiondirectory.po b/mail/locale/pl/fusiondirectory.po
index 702eda6bac..d68f537803 100644
--- a/mail/locale/pl/fusiondirectory.po
+++ b/mail/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Poczta"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Adres podstawowy"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Serwer"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Adresy alternatywne"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Przekaż wiadomości do członków bez grupy"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Usługi"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Błąd konfiguracji"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Nieznane"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr "Użycie Quoty"
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Poczta"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr "Ustawienia pocztowe"
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Adres podstawowy"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Serwer"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Wybierz serwer poczty który będzie przechowywał skrzynkę użytkownika"
@@ -161,6 +82,11 @@ msgstr "Rozmiar Quoty"
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Adresy alternatywne"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Lista alternatywnych adresów pocztowych"
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Błąd konfiguracji"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Nieznane"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Przekaż wiadomości do członków bez grupy"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Usługi"
diff --git a/mail/locale/pt/fusiondirectory.po b/mail/locale/pt/fusiondirectory.po
index 81517a3460..6398ea585c 100644
--- a/mail/locale/pt/fusiondirectory.po
+++ b/mail/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Correio"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Servidor"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Erro de configuração"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Correio"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr "Configurações de Correio"
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Servidor"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Erro de configuração"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/pt_BR/fusiondirectory.po b/mail/locale/pt_BR/fusiondirectory.po
index 975489aa98..11e869872a 100644
--- a/mail/locale/pt_BR/fusiondirectory.po
+++ b/mail/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Correio"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr "Opção de grupo de e-mail"
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Informações"
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Endereço primário"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr "Endereço de e-mail primário"
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "servidor"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr "Servidor de e-mail"
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Endereços alternativos"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr "Endereço de e-mail alternativo para o grupo"
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Encaminhar mensagens para não membros de grupos"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr "Serviço genérico IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr "IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Serviços"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Erro de configuração"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Nenhum"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr "Uso da cota"
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Correio"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr "Configurações de correio"
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Endereço primário"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "servidor"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Especifique o servidor de correio que o usuário está hospedado"
@@ -161,6 +82,11 @@ msgstr "Tamanho da cota"
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Endereços alternativos"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Lista de endereços alternativos de correio"
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Erro de configuração"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "Nenhum"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr "Opção de grupo de e-mail"
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr "Informações"
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr "Endereço de e-mail primário"
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr "Servidor de e-mail"
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr "Endereço de e-mail alternativo para o grupo"
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Encaminhar mensagens para não membros de grupos"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr "Serviço genérico IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr "IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Serviços"
diff --git a/mail/locale/ru/fusiondirectory.po b/mail/locale/ru/fusiondirectory.po
index c341363398..1194999156 100644
--- a/mail/locale/ru/fusiondirectory.po
+++ b/mail/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-24 12:33+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -19,101 +19,6 @@ 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/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Почта"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr "Информация"
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "Основной адрес"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr "Основной адрес электронной почты"
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Сервер"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "Альтернативные адреса"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr "Альтернативный адрес почты для группы"
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "Пересылать сообщения не членам группы"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr "IMAP/POP3"
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Сервисы"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Ошибка конфигурации"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Не известный почтовый метод '%s'!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Неизвестно"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr "Неограниченный"
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -138,6 +43,12 @@ msgstr "Использование квоты"
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Почта"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -147,10 +58,20 @@ msgstr "Настройки почты"
 msgid "Mail account"
 msgstr "Почтовый аккаунт"
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "Основной адрес"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr "Первичный адрес почты"
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Сервер"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Выберите почтовый сервер для учетной записи пользователя"
@@ -163,6 +84,11 @@ msgstr "Размер квоты"
 msgid "Other addresses and redirections"
 msgstr "Другие адреса и редиректы (перенаправления)"
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "Альтернативные адреса"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "Список альтернативных адресов эл. почты"
@@ -252,6 +178,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr "Не могу удалить почтовый ящик: \"%s\""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Ошибка конфигурации"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr "Не известный почтовый метод '%s'!"
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr "Неограниченный"
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr "Настройка плагина Почта"
@@ -324,3 +278,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr "Информация"
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr "Основной адрес электронной почты"
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr "Альтернативный адрес почты для группы"
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "Пересылать сообщения не членам группы"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr "IMAP/POP3"
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Сервисы"
diff --git a/mail/locale/ru@petr1708/fusiondirectory.po b/mail/locale/ru@petr1708/fusiondirectory.po
index 5c94c410f6..0760ceb7fe 100644
--- a/mail/locale/ru@petr1708/fusiondirectory.po
+++ b/mail/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,101 +17,6 @@ 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/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/sv/fusiondirectory.po b/mail/locale/sv/fusiondirectory.po
index 1b4732c110..0784b5c476 100644
--- a/mail/locale/sv/fusiondirectory.po
+++ b/mail/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Epost"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Server"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "Tjänster"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Konfigurationsfel"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Ingen"
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Okänd"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Epost"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Server"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Konfigurationsfel"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr "Ingen"
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Okänd"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "Tjänster"
diff --git a/mail/locale/ug/fusiondirectory.po b/mail/locale/ug/fusiondirectory.po
index 6797e8f100..7d985487f4 100644
--- a/mail/locale/ug/fusiondirectory.po
+++ b/mail/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr ""
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/vi_VN/fusiondirectory.po b/mail/locale/vi_VN/fusiondirectory.po
index 0f36cccde8..d876440f57 100644
--- a/mail/locale/vi_VN/fusiondirectory.po
+++ b/mail/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "Thư"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "Máy chủ (server)"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr "Lỗi cấu hình"
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "Không rõ"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "Thư"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr "Thiết lập mail"
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "Máy chủ (server)"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
@@ -161,6 +82,11 @@ msgstr ""
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr ""
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr ""
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr "Lỗi cấu hình"
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "Không rõ"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
diff --git a/mail/locale/zh/fusiondirectory.po b/mail/locale/zh/fusiondirectory.po
index a508016513..5cfd6c8142 100644
--- a/mail/locale/zh/fusiondirectory.po
+++ b/mail/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-07-01 14:11+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,101 +17,6 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/groups/mail/class_groupMail.inc:46
-#: personal/mail/class_mailAccount.inc:71
-#: config/mail/class_mailPluginConfig.inc:28
-msgid "Mail"
-msgstr "邮件"
-
-#: admin/groups/mail/class_groupMail.inc:47
-msgid "Group mail options"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:59
-msgid "Informations"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:62
-#: personal/mail/class_mailAccount.inc:97
-msgid "Primary address"
-msgstr "主要地址"
-
-#: admin/groups/mail/class_groupMail.inc:62
-msgid "The primary mail address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:66
-#: personal/mail/class_mailAccount.inc:101
-msgid "Server"
-msgstr "服务器"
-
-#: admin/groups/mail/class_groupMail.inc:66
-msgid "Server mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:72
-#: personal/mail/class_mailAccount.inc:117
-msgid "Alternative addresses"
-msgstr "替代地址"
-
-#: admin/groups/mail/class_groupMail.inc:72
-msgid "Alternative mail addresses for the group"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:77
-msgid "Forward messages to non group members"
-msgstr "转发邮件到非组成员"
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:81
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:32
-msgid "IMAP/POP3 generic service"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "IMAP/POP3"
-msgstr ""
-
-#: admin/systems/services/imap/class_serviceIMAP.inc:33
-msgid "Services"
-msgstr "服务"
-
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
-msgid "Configuration error"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:155
-#, php-format
-msgid "The configured mail attribute '%s' is unsupported!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:517
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr ""
-
-#: personal/mail/class_mail-methods.inc:854
-msgid "Unknown"
-msgstr "未知"
-
-#: personal/mail/class_mail-methods.inc:856
-msgid "Unlimited"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:45
 #: personal/mail/class_mailAccount.inc:238
 #: personal/mail/class_mailAccount.inc:241
@@ -136,6 +41,12 @@ msgstr "使用 Quota"
 msgid "Part of the quota which is used"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:71
+#: config/mail/class_mailPluginConfig.inc:28
+#: admin/groups/mail/class_groupMail.inc:46
+msgid "Mail"
+msgstr "邮件"
+
 #: personal/mail/class_mailAccount.inc:72
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
@@ -145,10 +56,20 @@ msgstr "邮件选项"
 msgid "Mail account"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:97
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "Primary address"
+msgstr "主要地址"
+
 #: personal/mail/class_mailAccount.inc:97
 msgid "Primary mail address"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:101
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server"
+msgstr "服务器"
+
 #: personal/mail/class_mailAccount.inc:101
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "描述该用户账号所要创建于的邮件服务器"
@@ -161,6 +82,11 @@ msgstr "Quota 大小"
 msgid "Other addresses and redirections"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:117
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative addresses"
+msgstr "替代地址"
+
 #: personal/mail/class_mailAccount.inc:117
 msgid "List of alternative mail addresses"
 msgstr "替代邮件地址列表"
@@ -250,6 +176,34 @@ msgstr ""
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
+#: personal/mail/class_mail-methods.inc:154
+#: personal/mail/class_mail-methods.inc:516
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:155
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:517
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:764
+#: personal/mail/class_mail-methods.inc:765
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:854
+msgid "Unknown"
+msgstr "未知"
+
+#: personal/mail/class_mail-methods.inc:856
+msgid "Unlimited"
+msgstr ""
+
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
 msgstr ""
@@ -322,3 +276,49 @@ msgstr ""
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Prefix to add for mail shared folders."
 msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:59
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:66
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:77
+msgid "Forward messages to non group members"
+msgstr "转发邮件到非组成员"
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr "服务"
diff --git a/mixedgroups/locale/ar/fusiondirectory.po b/mixedgroups/locale/ar/fusiondirectory.po
index 695a7b1296..4d59d3a199 100644
--- a/mixedgroups/locale/ar/fusiondirectory.po
+++ b/mixedgroups/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/mixedgroups/locale/ca/fusiondirectory.po b/mixedgroups/locale/ca/fusiondirectory.po
index 630c14f3c2..22ac0f0800 100644
--- a/mixedgroups/locale/ca/fusiondirectory.po
+++ b/mixedgroups/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/mixedgroups/locale/cs_CZ/fusiondirectory.po b/mixedgroups/locale/cs_CZ/fusiondirectory.po
index e603b2fa85..0712c58681 100644
--- a/mixedgroups/locale/cs_CZ/fusiondirectory.po
+++ b/mixedgroups/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/mixedgroups/locale/de/fusiondirectory.po b/mixedgroups/locale/de/fusiondirectory.po
index 17cb522cfb..de36c34780 100644
--- a/mixedgroups/locale/de/fusiondirectory.po
+++ b/mixedgroups/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/mixedgroups/locale/el_GR/fusiondirectory.po b/mixedgroups/locale/el_GR/fusiondirectory.po
index 6fb5fc38c0..874a95c44e 100644
--- a/mixedgroups/locale/el_GR/fusiondirectory.po
+++ b/mixedgroups/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/mixedgroups/locale/es/fusiondirectory.po b/mixedgroups/locale/es/fusiondirectory.po
index ffa22b1fe0..1d903dff76 100644
--- a/mixedgroups/locale/es/fusiondirectory.po
+++ b/mixedgroups/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/mixedgroups/locale/es_CO/fusiondirectory.po b/mixedgroups/locale/es_CO/fusiondirectory.po
index 507ff2049c..7bb2bf5434 100644
--- a/mixedgroups/locale/es_CO/fusiondirectory.po
+++ b/mixedgroups/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/mixedgroups/locale/es_VE/fusiondirectory.po b/mixedgroups/locale/es_VE/fusiondirectory.po
index c76018a937..8406115af1 100644
--- a/mixedgroups/locale/es_VE/fusiondirectory.po
+++ b/mixedgroups/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/mixedgroups/locale/fa_IR/fusiondirectory.po b/mixedgroups/locale/fa_IR/fusiondirectory.po
index 6a6c125b06..8e132f34b4 100644
--- a/mixedgroups/locale/fa_IR/fusiondirectory.po
+++ b/mixedgroups/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/mixedgroups/locale/fi_FI/fusiondirectory.po b/mixedgroups/locale/fi_FI/fusiondirectory.po
index 5dd7e92632..16861773f4 100644
--- a/mixedgroups/locale/fi_FI/fusiondirectory.po
+++ b/mixedgroups/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/mixedgroups/locale/fr/fusiondirectory.po b/mixedgroups/locale/fr/fusiondirectory.po
index e75692f968..fb532a4a62 100644
--- a/mixedgroups/locale/fr/fusiondirectory.po
+++ b/mixedgroups/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/mixedgroups/locale/hu_HU/fusiondirectory.po b/mixedgroups/locale/hu_HU/fusiondirectory.po
index 45f8d45925..b187c68848 100644
--- a/mixedgroups/locale/hu_HU/fusiondirectory.po
+++ b/mixedgroups/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/mixedgroups/locale/id/fusiondirectory.po b/mixedgroups/locale/id/fusiondirectory.po
index 5a0244f68b..fccce6d97b 100644
--- a/mixedgroups/locale/id/fusiondirectory.po
+++ b/mixedgroups/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/mixedgroups/locale/it_IT/fusiondirectory.po b/mixedgroups/locale/it_IT/fusiondirectory.po
index 213cc459ec..71746de52c 100644
--- a/mixedgroups/locale/it_IT/fusiondirectory.po
+++ b/mixedgroups/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 14:39+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/mixedgroups/locale/lv/fusiondirectory.po b/mixedgroups/locale/lv/fusiondirectory.po
index 8052cd90b2..dd161036b5 100644
--- a/mixedgroups/locale/lv/fusiondirectory.po
+++ b/mixedgroups/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/mixedgroups/locale/nb/fusiondirectory.po b/mixedgroups/locale/nb/fusiondirectory.po
index 88d7e44445..f87c983376 100644
--- a/mixedgroups/locale/nb/fusiondirectory.po
+++ b/mixedgroups/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/mixedgroups/locale/nl/fusiondirectory.po b/mixedgroups/locale/nl/fusiondirectory.po
index 4f52475e1c..ac1c70eea4 100644
--- a/mixedgroups/locale/nl/fusiondirectory.po
+++ b/mixedgroups/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/mixedgroups/locale/pl/fusiondirectory.po b/mixedgroups/locale/pl/fusiondirectory.po
index 0b75cacdfb..1119fd6017 100644
--- a/mixedgroups/locale/pl/fusiondirectory.po
+++ b/mixedgroups/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/mixedgroups/locale/pt/fusiondirectory.po b/mixedgroups/locale/pt/fusiondirectory.po
index cbfd0020a8..91492be1eb 100644
--- a/mixedgroups/locale/pt/fusiondirectory.po
+++ b/mixedgroups/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/mixedgroups/locale/pt_BR/fusiondirectory.po b/mixedgroups/locale/pt_BR/fusiondirectory.po
index 0ae7433780..5126fb2c62 100644
--- a/mixedgroups/locale/pt_BR/fusiondirectory.po
+++ b/mixedgroups/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/mixedgroups/locale/ru/fusiondirectory.po b/mixedgroups/locale/ru/fusiondirectory.po
index d26d5c950d..91af038ec0 100644
--- a/mixedgroups/locale/ru/fusiondirectory.po
+++ b/mixedgroups/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-10 07:14+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/mixedgroups/locale/ru@petr1708/fusiondirectory.po b/mixedgroups/locale/ru@petr1708/fusiondirectory.po
index d9c22c7a28..099a7c34c9 100644
--- a/mixedgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/mixedgroups/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/mixedgroups/locale/sv/fusiondirectory.po b/mixedgroups/locale/sv/fusiondirectory.po
index e103dbc862..92bef7900c 100644
--- a/mixedgroups/locale/sv/fusiondirectory.po
+++ b/mixedgroups/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/mixedgroups/locale/ug/fusiondirectory.po b/mixedgroups/locale/ug/fusiondirectory.po
index 0feae8fff0..8c104e9889 100644
--- a/mixedgroups/locale/ug/fusiondirectory.po
+++ b/mixedgroups/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:51+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/mixedgroups/locale/vi_VN/fusiondirectory.po b/mixedgroups/locale/vi_VN/fusiondirectory.po
index 5552e850bd..b456ec3a0e 100644
--- a/mixedgroups/locale/vi_VN/fusiondirectory.po
+++ b/mixedgroups/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/mixedgroups/locale/zh/fusiondirectory.po b/mixedgroups/locale/zh/fusiondirectory.po
index fcd2d82a71..850c2865ac 100644
--- a/mixedgroups/locale/zh/fusiondirectory.po
+++ b/mixedgroups/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/nagios/locale/ar/fusiondirectory.po b/nagios/locale/ar/fusiondirectory.po
index 38e2f9e672..2df62a867a 100644
--- a/nagios/locale/ar/fusiondirectory.po
+++ b/nagios/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/nagios/locale/ca/fusiondirectory.po b/nagios/locale/ca/fusiondirectory.po
index 876ec906d8..77683fbc78 100644
--- a/nagios/locale/ca/fusiondirectory.po
+++ b/nagios/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/nagios/locale/cs_CZ/fusiondirectory.po b/nagios/locale/cs_CZ/fusiondirectory.po
index df4d62caf5..46f625bfb0 100644
--- a/nagios/locale/cs_CZ/fusiondirectory.po
+++ b/nagios/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/nagios/locale/de/fusiondirectory.po b/nagios/locale/de/fusiondirectory.po
index 682eb0ebb3..3d60be5b53 100644
--- a/nagios/locale/de/fusiondirectory.po
+++ b/nagios/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/nagios/locale/el_GR/fusiondirectory.po b/nagios/locale/el_GR/fusiondirectory.po
index bf43d84e58..ad956962ce 100644
--- a/nagios/locale/el_GR/fusiondirectory.po
+++ b/nagios/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/nagios/locale/es/fusiondirectory.po b/nagios/locale/es/fusiondirectory.po
index 4e706844cc..539bb4db63 100644
--- a/nagios/locale/es/fusiondirectory.po
+++ b/nagios/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/nagios/locale/es_CO/fusiondirectory.po b/nagios/locale/es_CO/fusiondirectory.po
index 350fe678e1..7d9e29f6b5 100644
--- a/nagios/locale/es_CO/fusiondirectory.po
+++ b/nagios/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/nagios/locale/es_VE/fusiondirectory.po b/nagios/locale/es_VE/fusiondirectory.po
index 3a8e1d43c8..bb4943db34 100644
--- a/nagios/locale/es_VE/fusiondirectory.po
+++ b/nagios/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/nagios/locale/fa_IR/fusiondirectory.po b/nagios/locale/fa_IR/fusiondirectory.po
index 0ca92844b1..90b0eeeac0 100644
--- a/nagios/locale/fa_IR/fusiondirectory.po
+++ b/nagios/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/nagios/locale/fi_FI/fusiondirectory.po b/nagios/locale/fi_FI/fusiondirectory.po
index 1f2d053196..36cb43bba2 100644
--- a/nagios/locale/fi_FI/fusiondirectory.po
+++ b/nagios/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:52+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/nagios/locale/fr/fusiondirectory.po b/nagios/locale/fr/fusiondirectory.po
index b488faf55e..02ea87b9fe 100644
--- a/nagios/locale/fr/fusiondirectory.po
+++ b/nagios/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/nagios/locale/hu_HU/fusiondirectory.po b/nagios/locale/hu_HU/fusiondirectory.po
index 39cdde1080..1c3e1f92ce 100644
--- a/nagios/locale/hu_HU/fusiondirectory.po
+++ b/nagios/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:52+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/nagios/locale/id/fusiondirectory.po b/nagios/locale/id/fusiondirectory.po
index 0e672ee6fc..6565ba8d48 100644
--- a/nagios/locale/id/fusiondirectory.po
+++ b/nagios/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/nagios/locale/it_IT/fusiondirectory.po b/nagios/locale/it_IT/fusiondirectory.po
index be28d50a7e..de972d294f 100644
--- a/nagios/locale/it_IT/fusiondirectory.po
+++ b/nagios/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/nagios/locale/lv/fusiondirectory.po b/nagios/locale/lv/fusiondirectory.po
index 74840b07c5..0bae79956f 100644
--- a/nagios/locale/lv/fusiondirectory.po
+++ b/nagios/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/nagios/locale/nb/fusiondirectory.po b/nagios/locale/nb/fusiondirectory.po
index fd1d910201..6cfcbe59f5 100644
--- a/nagios/locale/nb/fusiondirectory.po
+++ b/nagios/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/nagios/locale/nl/fusiondirectory.po b/nagios/locale/nl/fusiondirectory.po
index afa05a12fe..d9ced838d2 100644
--- a/nagios/locale/nl/fusiondirectory.po
+++ b/nagios/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/nagios/locale/pl/fusiondirectory.po b/nagios/locale/pl/fusiondirectory.po
index 9cde63e54b..0d57688f7f 100644
--- a/nagios/locale/pl/fusiondirectory.po
+++ b/nagios/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/nagios/locale/pt/fusiondirectory.po b/nagios/locale/pt/fusiondirectory.po
index de41e54e14..3e257d2a1e 100644
--- a/nagios/locale/pt/fusiondirectory.po
+++ b/nagios/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/nagios/locale/pt_BR/fusiondirectory.po b/nagios/locale/pt_BR/fusiondirectory.po
index ea048e3a9e..3477b416b2 100644
--- a/nagios/locale/pt_BR/fusiondirectory.po
+++ b/nagios/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/nagios/locale/ru/fusiondirectory.po b/nagios/locale/ru/fusiondirectory.po
index 57dfd748d9..98a4ea32f7 100644
--- a/nagios/locale/ru/fusiondirectory.po
+++ b/nagios/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/nagios/locale/ru@petr1708/fusiondirectory.po b/nagios/locale/ru@petr1708/fusiondirectory.po
index 5d5a4ff46b..0a19a775ec 100644
--- a/nagios/locale/ru@petr1708/fusiondirectory.po
+++ b/nagios/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/nagios/locale/sv/fusiondirectory.po b/nagios/locale/sv/fusiondirectory.po
index 9c610b1795..326f34b0c2 100644
--- a/nagios/locale/sv/fusiondirectory.po
+++ b/nagios/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/nagios/locale/ug/fusiondirectory.po b/nagios/locale/ug/fusiondirectory.po
index a6e106b0a6..beba28f8c1 100644
--- a/nagios/locale/ug/fusiondirectory.po
+++ b/nagios/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/nagios/locale/vi_VN/fusiondirectory.po b/nagios/locale/vi_VN/fusiondirectory.po
index e4d7da7cfc..b6954d3d3b 100644
--- a/nagios/locale/vi_VN/fusiondirectory.po
+++ b/nagios/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/nagios/locale/zh/fusiondirectory.po b/nagios/locale/zh/fusiondirectory.po
index eb6845b3f9..6f327082ba 100644
--- a/nagios/locale/zh/fusiondirectory.po
+++ b/nagios/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-10 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/netgroups/locale/ar/fusiondirectory.po b/netgroups/locale/ar/fusiondirectory.po
index 2439cfbaa3..024075444e 100644
--- a/netgroups/locale/ar/fusiondirectory.po
+++ b/netgroups/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,19 +17,48 @@ 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/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/ca/fusiondirectory.po b/netgroups/locale/ca/fusiondirectory.po
index fd9910655d..53e4a12965 100644
--- a/netgroups/locale/ca/fusiondirectory.po
+++ b/netgroups/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/cs_CZ/fusiondirectory.po b/netgroups/locale/cs_CZ/fusiondirectory.po
index e806b148bf..68dcef586f 100644
--- a/netgroups/locale/cs_CZ/fusiondirectory.po
+++ b/netgroups/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,21 +17,50 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr "Síťová skupina v NIS"
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr "Člen síťové skupiny NIS"
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr "Člen následujících NIS síťových skupin"
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr "Členství v síťové skupiny NIS"
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr "Nastavení síťové skupiny"
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr "Nastavení zásuvného modulu netgroup pro FusionDirectory"
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr "Síťová skupina"
 
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
+msgstr "Relativní rozlišený název síťové skupiny"
+
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr "Větev, ve které budou ukládány síťové skupiny"
+
 #: admin/netgroups/class_netgroup.inc:51
 msgid "NIS Netgroup settings"
 msgstr "Nastavení síťové skupiny v NIS"
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
-msgstr "Síťová skupina v NIS"
-
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
 msgstr "Informace"
@@ -76,32 +105,3 @@ msgstr "Skupiny NIS"
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr "Správa síťové NIS skupiny"
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr "Člen síťové skupiny NIS"
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr "Člen následujících NIS síťových skupin"
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr "Členství v síťové skupiny NIS"
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr "Nastavení síťové skupiny"
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr "Nastavení zásuvného modulu netgroup pro FusionDirectory"
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr "Relativní rozlišený název síťové skupiny"
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr "Větev, ve které budou ukládány síťové skupiny"
diff --git a/netgroups/locale/de/fusiondirectory.po b/netgroups/locale/de/fusiondirectory.po
index 3582b9fdd8..b5ae085402 100644
--- a/netgroups/locale/de/fusiondirectory.po
+++ b/netgroups/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,21 +18,50 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr "NIS-Netzgruppe"
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr "NIS-Netzgruppenmitglied"
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr "Mitglied der folgenden NIS-Netzgruppen"
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr "NIS-Netzgruppenmitgliedschaft"
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr "Netzgruppenkonfiguration"
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr "FusionDirectory Netzgruppen-Plugin-Konfiguration"
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr "Netzgruppe"
 
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
+msgstr "Netzgruppe RDN"
+
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr "Zweig, in dem Netzgruppen gespeichert werden"
+
 #: admin/netgroups/class_netgroup.inc:51
 msgid "NIS Netgroup settings"
 msgstr "NIS-Netzgruppeneinstellungen"
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
-msgstr "NIS-Netzgruppe"
-
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
 msgstr "Informationen"
@@ -77,32 +106,3 @@ msgstr "NIS-Netzgruppen"
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr "NIS-Netzgruppenverwaltung"
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr "NIS-Netzgruppenmitglied"
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr "Mitglied der folgenden NIS-Netzgruppen"
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr "NIS-Netzgruppenmitgliedschaft"
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr "Netzgruppenkonfiguration"
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr "FusionDirectory Netzgruppen-Plugin-Konfiguration"
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr "Netzgruppe RDN"
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr "Zweig, in dem Netzgruppen gespeichert werden"
diff --git a/netgroups/locale/el_GR/fusiondirectory.po b/netgroups/locale/el_GR/fusiondirectory.po
index 8b7afbe230..c406269326 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,21 +18,50 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr "NIS Netgroup"
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr "Μέλος NIS Netgroup"
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr "Μέλος στα ακόλουθα NIS Netgroups  "
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr "Μέλη NIS Netgroup"
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr "Ρύθμιση Netgroup"
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory netgroup"
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr "Netgroup"
 
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
+msgstr "Netgroup RDN"
+
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr "Κλάδος στον οποίο θα αποθηκεύονται τα netgroups"
+
 #: admin/netgroups/class_netgroup.inc:51
 msgid "NIS Netgroup settings"
 msgstr "Ρυθμίσεις NIS Netgroup"
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
-msgstr "NIS Netgroup"
-
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
 msgstr "Πληροφορίες"
@@ -77,32 +106,3 @@ msgstr "NIS Netgroups"
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr "Διαχείριση NIS Netgroup"
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr "Μέλος NIS Netgroup"
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr "Μέλος στα ακόλουθα NIS Netgroups  "
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr "Μέλη NIS Netgroup"
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr "Ρύθμιση Netgroup"
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory netgroup"
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr "Netgroup RDN"
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr "Κλάδος στον οποίο θα αποθηκεύονται τα netgroups"
diff --git a/netgroups/locale/es/fusiondirectory.po b/netgroups/locale/es/fusiondirectory.po
index d3752df788..63bde00fae 100644
--- a/netgroups/locale/es/fusiondirectory.po
+++ b/netgroups/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,21 +17,50 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr "NIS Netgroup"
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr "Miembro del NIS Netgroup"
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
+#: 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 ""
+
 #: 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 "NIS Netgroup"
-
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
 msgstr ""
@@ -76,32 +105,3 @@ msgstr "NIS Netgroups"
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr "Miembro del NIS Netgroup"
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/es_CO/fusiondirectory.po b/netgroups/locale/es_CO/fusiondirectory.po
index 58b17f608f..6457105c61 100644
--- a/netgroups/locale/es_CO/fusiondirectory.po
+++ b/netgroups/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/es_VE/fusiondirectory.po b/netgroups/locale/es_VE/fusiondirectory.po
index d9d084c81d..1a5f698dbc 100644
--- a/netgroups/locale/es_VE/fusiondirectory.po
+++ b/netgroups/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,21 +17,50 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr "NIS Netgroup"
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr "Miembro del NIS Netgroup"
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
+#: 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 ""
+
 #: 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 "NIS Netgroup"
-
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
 msgstr ""
@@ -76,32 +105,3 @@ msgstr "NIS Netgroups"
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr "Miembro del NIS Netgroup"
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/fa_IR/fusiondirectory.po b/netgroups/locale/fa_IR/fusiondirectory.po
index 12f536ba90..af709bc50a 100644
--- a/netgroups/locale/fa_IR/fusiondirectory.po
+++ b/netgroups/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:52+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/fi_FI/fusiondirectory.po b/netgroups/locale/fi_FI/fusiondirectory.po
index 3923b95a01..1ffb0a2cbe 100644
--- a/netgroups/locale/fi_FI/fusiondirectory.po
+++ b/netgroups/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:52+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/fr/fusiondirectory.po b/netgroups/locale/fr/fusiondirectory.po
index 047c77a182..4e5e83d4c5 100644
--- a/netgroups/locale/fr/fusiondirectory.po
+++ b/netgroups/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,21 +18,50 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr "Groupe NIS"
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr "Membre d'un groupe NIS"
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr "Membre des groupes NIS suivants"
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr "Appartenance à un groupe NIS"
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr "Configuration Netgroup"
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr "Configuration du plugin Netgroup"
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr "Netgroup"
 
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
+msgstr "Branche des objets Netgroup"
+
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr "Branches où seront stockés les objets Netgroup"
+
 #: admin/netgroups/class_netgroup.inc:51
 msgid "NIS Netgroup settings"
 msgstr "Paramètres des groupes NIS"
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
-msgstr "Groupe NIS"
-
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
 msgstr "Informations"
@@ -77,32 +106,3 @@ msgstr "Groupes NIS"
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr "Gestion des groupes NIS"
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr "Membre d'un groupe NIS"
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr "Membre des groupes NIS suivants"
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr "Appartenance à un groupe NIS"
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr "Configuration Netgroup"
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr "Configuration du plugin Netgroup"
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr "Branche des objets Netgroup"
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr "Branches où seront stockés les objets Netgroup"
diff --git a/netgroups/locale/hu_HU/fusiondirectory.po b/netgroups/locale/hu_HU/fusiondirectory.po
index 1d51ddbd9b..8287e875e8 100644
--- a/netgroups/locale/hu_HU/fusiondirectory.po
+++ b/netgroups/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:52+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/id/fusiondirectory.po b/netgroups/locale/id/fusiondirectory.po
index 2f5b73eb98..14dcb317a8 100644
--- a/netgroups/locale/id/fusiondirectory.po
+++ b/netgroups/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:52+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/it_IT/fusiondirectory.po b/netgroups/locale/it_IT/fusiondirectory.po
index d630e3496f..1dee917d44 100644
--- a/netgroups/locale/it_IT/fusiondirectory.po
+++ b/netgroups/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,21 +19,50 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr "Gruppo NIS"
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr "Membro del gruppo NIS"
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr "Membri dei seguenti gruppi NIS"
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr "Adesione al gruppo NIS"
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr "Configurazione gruppo NIS"
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr "Configurazione del plugin NIS di FusionDirectory"
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr "Gruppo NIS"
 
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
+msgstr "Gruppo NIS RDN"
+
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr "Ramo nel quale i gruppi NIS verranno immagazzinati"
+
 #: admin/netgroups/class_netgroup.inc:51
 msgid "NIS Netgroup settings"
 msgstr "Impostazioni gruppo NIS"
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
-msgstr "Gruppo NIS"
-
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
 msgstr "Informazioni"
@@ -78,32 +107,3 @@ msgstr "Gruppi NIS"
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr "Gestione NIS Netgroup"
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr "Membro del gruppo NIS"
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr "Membri dei seguenti gruppi NIS"
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr "Adesione al gruppo NIS"
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr "Configurazione gruppo NIS"
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr "Configurazione del plugin NIS di FusionDirectory"
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr "Gruppo NIS RDN"
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr "Ramo nel quale i gruppi NIS verranno immagazzinati"
diff --git a/netgroups/locale/lv/fusiondirectory.po b/netgroups/locale/lv/fusiondirectory.po
index 2400862749..4c0839e651 100644
--- a/netgroups/locale/lv/fusiondirectory.po
+++ b/netgroups/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/nb/fusiondirectory.po b/netgroups/locale/nb/fusiondirectory.po
index 8b6e38111c..a7a28299dd 100644
--- a/netgroups/locale/nb/fusiondirectory.po
+++ b/netgroups/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,21 +17,50 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr "NIS-nettgruppe"
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr "NIS-nettgruppemedlem"
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
+#: 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 ""
+
 #: 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 "NIS-nettgruppe"
-
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
 msgstr ""
@@ -76,32 +105,3 @@ msgstr "NIS-nettgrupper"
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr "NIS-nettgruppemedlem"
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/nl/fusiondirectory.po b/netgroups/locale/nl/fusiondirectory.po
index b4a3d95382..a57a5b5b23 100644
--- a/netgroups/locale/nl/fusiondirectory.po
+++ b/netgroups/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,21 +17,50 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr "NIS netgroup"
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr "NIS Netgroup deelnemer"
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
+#: 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 ""
+
 #: 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 "NIS netgroup"
-
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
 msgstr "Informatie"
@@ -76,32 +105,3 @@ msgstr "NIS Netgroups"
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr "NIS Netgroup beheer"
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr "NIS Netgroup deelnemer"
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/pl/fusiondirectory.po b/netgroups/locale/pl/fusiondirectory.po
index 52a16a8fbc..c4f8d822ce 100644
--- a/netgroups/locale/pl/fusiondirectory.po
+++ b/netgroups/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/pt/fusiondirectory.po b/netgroups/locale/pt/fusiondirectory.po
index 4f5e5ffc64..6502f74212 100644
--- a/netgroups/locale/pt/fusiondirectory.po
+++ b/netgroups/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/pt_BR/fusiondirectory.po b/netgroups/locale/pt_BR/fusiondirectory.po
index b63be4d4de..72cdd70e8d 100644
--- a/netgroups/locale/pt_BR/fusiondirectory.po
+++ b/netgroups/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,21 +17,50 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr "Netgroup NIS"
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr "membro do NIS Netgroup"
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr "Membros seguidores do NIS Netgroups"
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
+#: 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 ""
+
 #: 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 "Netgroup NIS"
-
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
 msgstr "Informações"
@@ -76,32 +105,3 @@ msgstr "Netgroups NIS"
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr "Gerenciamento do NIS Netgroup"
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr "membro do NIS Netgroup"
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr "Membros seguidores do NIS Netgroups"
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/ru/fusiondirectory.po b/netgroups/locale/ru/fusiondirectory.po
index c15b4ea5ed..ad2ccffc07 100644
--- a/netgroups/locale/ru/fusiondirectory.po
+++ b/netgroups/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,19 +17,48 @@ 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/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/ru@petr1708/fusiondirectory.po b/netgroups/locale/ru@petr1708/fusiondirectory.po
index 09f9fd7cc4..5201f0dfe3 100644
--- a/netgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/netgroups/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:52+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,19 +17,48 @@ 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/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/sv/fusiondirectory.po b/netgroups/locale/sv/fusiondirectory.po
index 1bbff96ee4..6c99d2226b 100644
--- a/netgroups/locale/sv/fusiondirectory.po
+++ b/netgroups/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/ug/fusiondirectory.po b/netgroups/locale/ug/fusiondirectory.po
index 87fbb9ba43..3c3393e596 100644
--- a/netgroups/locale/ug/fusiondirectory.po
+++ b/netgroups/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:52+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/vi_VN/fusiondirectory.po b/netgroups/locale/vi_VN/fusiondirectory.po
index a7f6b02ade..1137219586 100644
--- a/netgroups/locale/vi_VN/fusiondirectory.po
+++ b/netgroups/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/netgroups/locale/zh/fusiondirectory.po b/netgroups/locale/zh/fusiondirectory.po
index 0a91b1bc64..aa361d7a81 100644
--- a/netgroups/locale/zh/fusiondirectory.po
+++ b/netgroups/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,19 +17,48 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/netgroups/class_netgroup.inc:50
+#: personal/netgroups/class_netgroupMembership.inc:43
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+msgid "NIS Netgroup"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:44
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
 #: config/netgroups/class_netgroupConfig.inc:42
+#: admin/netgroups/class_netgroup.inc:50
 msgid "Netgroup"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:51
-msgid "NIS Netgroup settings"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
 msgstr ""
 
-#: admin/netgroups/class_netgroup.inc:54
-#: admin/systems/netgroups/class_netgroupSystem.inc:26
-#: personal/netgroups/class_netgroupMembership.inc:43
-msgid "NIS Netgroup"
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
 msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:69
@@ -76,32 +105,3 @@ msgstr ""
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
 msgstr ""
-
-#: admin/systems/netgroups/class_netgroupSystem.inc:27
-#: personal/netgroups/class_netgroupMembership.inc:44
-msgid "NIS Netgroup member"
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:60
-msgid "Member of the following NIS Netgroups  "
-msgstr ""
-
-#: personal/netgroups/class_netgroupMembership.inc:63
-msgid "NIS netgroup membership"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:28
-msgid "Netgroup configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:29
-msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Netgroup RDN"
-msgstr ""
-
-#: config/netgroups/class_netgroupConfig.inc:45
-msgid "Branch in which netgroups will be stored"
-msgstr ""
diff --git a/newsletter/locale/ar/fusiondirectory.po b/newsletter/locale/ar/fusiondirectory.po
index 6cec540296..04dc16515d 100644
--- a/newsletter/locale/ar/fusiondirectory.po
+++ b/newsletter/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/newsletter/locale/ca/fusiondirectory.po b/newsletter/locale/ca/fusiondirectory.po
index 3d56725591..712929cb79 100644
--- a/newsletter/locale/ca/fusiondirectory.po
+++ b/newsletter/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/newsletter/locale/cs_CZ/fusiondirectory.po b/newsletter/locale/cs_CZ/fusiondirectory.po
index 7d9fd847ac..5ca3bba97e 100644
--- a/newsletter/locale/cs_CZ/fusiondirectory.po
+++ b/newsletter/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/newsletter/locale/de/fusiondirectory.po b/newsletter/locale/de/fusiondirectory.po
index 94d32d5c7b..02899d4fc3 100644
--- a/newsletter/locale/de/fusiondirectory.po
+++ b/newsletter/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/newsletter/locale/el_GR/fusiondirectory.po b/newsletter/locale/el_GR/fusiondirectory.po
index f31fb0dce1..1147d234aa 100644
--- a/newsletter/locale/el_GR/fusiondirectory.po
+++ b/newsletter/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/newsletter/locale/es/fusiondirectory.po b/newsletter/locale/es/fusiondirectory.po
index 835fb1e999..12fad584ac 100644
--- a/newsletter/locale/es/fusiondirectory.po
+++ b/newsletter/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/newsletter/locale/es_CO/fusiondirectory.po b/newsletter/locale/es_CO/fusiondirectory.po
index bb4d8b4b1f..fda6148d36 100644
--- a/newsletter/locale/es_CO/fusiondirectory.po
+++ b/newsletter/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/newsletter/locale/es_VE/fusiondirectory.po b/newsletter/locale/es_VE/fusiondirectory.po
index fbb147bf4b..ac4660465c 100644
--- a/newsletter/locale/es_VE/fusiondirectory.po
+++ b/newsletter/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/newsletter/locale/fa_IR/fusiondirectory.po b/newsletter/locale/fa_IR/fusiondirectory.po
index 0fd4a0ee6d..0c4977f8de 100644
--- a/newsletter/locale/fa_IR/fusiondirectory.po
+++ b/newsletter/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/newsletter/locale/fi_FI/fusiondirectory.po b/newsletter/locale/fi_FI/fusiondirectory.po
index 63eb6e1917..1fd0af3e3c 100644
--- a/newsletter/locale/fi_FI/fusiondirectory.po
+++ b/newsletter/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/newsletter/locale/fr/fusiondirectory.po b/newsletter/locale/fr/fusiondirectory.po
index 20f60198ce..a2c7c93f83 100644
--- a/newsletter/locale/fr/fusiondirectory.po
+++ b/newsletter/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:27+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/newsletter/locale/hu_HU/fusiondirectory.po b/newsletter/locale/hu_HU/fusiondirectory.po
index d517a376b0..0c5002c507 100644
--- a/newsletter/locale/hu_HU/fusiondirectory.po
+++ b/newsletter/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/newsletter/locale/id/fusiondirectory.po b/newsletter/locale/id/fusiondirectory.po
index 7a4fb272ec..7c188ab449 100644
--- a/newsletter/locale/id/fusiondirectory.po
+++ b/newsletter/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/newsletter/locale/it_IT/fusiondirectory.po b/newsletter/locale/it_IT/fusiondirectory.po
index 7a55137c48..a470d7b9ff 100644
--- a/newsletter/locale/it_IT/fusiondirectory.po
+++ b/newsletter/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:58+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/newsletter/locale/lv/fusiondirectory.po b/newsletter/locale/lv/fusiondirectory.po
index 51c871284c..3266d1c062 100644
--- a/newsletter/locale/lv/fusiondirectory.po
+++ b/newsletter/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/newsletter/locale/nb/fusiondirectory.po b/newsletter/locale/nb/fusiondirectory.po
index d0c3fb470d..a0a8abb546 100644
--- a/newsletter/locale/nb/fusiondirectory.po
+++ b/newsletter/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/newsletter/locale/nl/fusiondirectory.po b/newsletter/locale/nl/fusiondirectory.po
index 5c7a34cfa2..e286860302 100644
--- a/newsletter/locale/nl/fusiondirectory.po
+++ b/newsletter/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/newsletter/locale/pl/fusiondirectory.po b/newsletter/locale/pl/fusiondirectory.po
index 1f2e7f75a8..f7bfde0f8f 100644
--- a/newsletter/locale/pl/fusiondirectory.po
+++ b/newsletter/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/newsletter/locale/pt/fusiondirectory.po b/newsletter/locale/pt/fusiondirectory.po
index d06ac95def..43afbe2f90 100644
--- a/newsletter/locale/pt/fusiondirectory.po
+++ b/newsletter/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/newsletter/locale/pt_BR/fusiondirectory.po b/newsletter/locale/pt_BR/fusiondirectory.po
index d515271222..11b6dcf8f0 100644
--- a/newsletter/locale/pt_BR/fusiondirectory.po
+++ b/newsletter/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/newsletter/locale/ru/fusiondirectory.po b/newsletter/locale/ru/fusiondirectory.po
index d423cd2793..58188f7a48 100644
--- a/newsletter/locale/ru/fusiondirectory.po
+++ b/newsletter/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/newsletter/locale/ru@petr1708/fusiondirectory.po b/newsletter/locale/ru@petr1708/fusiondirectory.po
index 3af742cf67..337bd0ce5a 100644
--- a/newsletter/locale/ru@petr1708/fusiondirectory.po
+++ b/newsletter/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/newsletter/locale/sv/fusiondirectory.po b/newsletter/locale/sv/fusiondirectory.po
index b1df78050e..01036ce482 100644
--- a/newsletter/locale/sv/fusiondirectory.po
+++ b/newsletter/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/newsletter/locale/ug/fusiondirectory.po b/newsletter/locale/ug/fusiondirectory.po
index 3e0081760d..a0341d8e45 100644
--- a/newsletter/locale/ug/fusiondirectory.po
+++ b/newsletter/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/newsletter/locale/vi_VN/fusiondirectory.po b/newsletter/locale/vi_VN/fusiondirectory.po
index b31422af5d..a2a0768c76 100644
--- a/newsletter/locale/vi_VN/fusiondirectory.po
+++ b/newsletter/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/newsletter/locale/zh/fusiondirectory.po b/newsletter/locale/zh/fusiondirectory.po
index c856735ecc..257f5efba6 100644
--- a/newsletter/locale/zh/fusiondirectory.po
+++ b/newsletter/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-07 12:15+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/opsi/locale/ar/fusiondirectory.po b/opsi/locale/ar/fusiondirectory.po
index 7cc9b64066..0952caf47b 100644
--- a/opsi/locale/ar/fusiondirectory.po
+++ b/opsi/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,50 @@ 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"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "الإسم"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr ""
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/ca/fusiondirectory.po b/opsi/locale/ca/fusiondirectory.po
index f242ac3e90..226bea4df7 100644
--- a/opsi/locale/ca/fusiondirectory.po
+++ b/opsi/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Nom"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Contrasenya"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/cs_CZ/fusiondirectory.po b/opsi/locale/cs_CZ/fusiondirectory.po
index 20f7f31d9b..0be6923404 100644
--- a/opsi/locale/cs_CZ/fusiondirectory.po
+++ b/opsi/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr "Importovat OPSI"
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr "Importovat počítače s MS Windows z OPSI do F.D."
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr "Server s Argonaut není dostupný"
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr "Žádná MAC adresa"
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr "Nelze aktualizovat OPSI informace"
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr "Nastavení OPSI"
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr "Nastavení nastavení zásuvného modulu OPSI pro FusionDirectory"
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr "OPSI"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr "Relativní rozlišený název OPSI"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr "Větev ve které budou ukládány OPSI profily"
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr "OPSI server pomocí kterého nasadit"
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Název"
 
@@ -92,16 +136,11 @@ 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:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr "Nedaří se kontaktovat argonaut server"
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr "Žádná MAC adresa"
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr "%s nelze v LDAP nalézt"
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr "Nezdařilo se kontaktovat OPSI server"
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr "OPSI"
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr "Správa sady nastavení OPSI"
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr "Vlastnosti produktu"
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr "Vlastnosti produktů v této sadě nastavení"
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr "Seznam programového vybavení, který bude nainstalován touto sadou na
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr "Správa sady nastavení OPSI"
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr "Vlastnosti produktu"
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr "Vlastnosti produktů v této sadě nastavení"
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr "Klient OPSI"
@@ -205,11 +239,6 @@ msgstr "Nelze zjistit macAddress pro OPSI server !"
 msgid "Could not remove OPSI informations"
 msgstr "OPSI informace nelze odebrat"
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr "Nelze aktualizovat OPSI informace"
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Heslo"
 msgid "The password to use for connection"
 msgstr "Heslo pro spojení"
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr "Importovat OPSI"
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr "Importovat počítače s MS Windows z OPSI do F.D."
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr "Server s Argonaut není dostupný"
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr "Nastavení OPSI"
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr "Nastavení nastavení zásuvného modulu OPSI pro FusionDirectory"
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr "Relativní rozlišený název OPSI"
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr "Větev ve které budou ukládány OPSI profily"
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/de/fusiondirectory.po b/opsi/locale/de/fusiondirectory.po
index 0ef93cf621..62d60b1bb5 100644
--- a/opsi/locale/de/fusiondirectory.po
+++ b/opsi/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr "OPSI-Import"
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr "Windows-Stationen von OPSI in FD importieren"
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr "Argonaut-Server ist nicht verfügbar"
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr "Keine MAC-Adresse"
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr "Konnte die OPSI-Informationen nicht aktualisieren"
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr "OPSI-Konfiguration"
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr "FusionDirectory OPSI-Plugin-Konfiguration"
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr "OPSI"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr "OPSI RDN"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr "Zweig, in dem OPSI-Profile gespeichert werden"
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -46,8 +90,8 @@ msgstr "Der zu verwendende OPSI-Server"
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Name"
 
@@ -93,16 +137,11 @@ 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:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr "Keine Verbindung zum Argonaut-Server"
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr "Keine MAC-Adresse"
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -116,29 +155,11 @@ msgid "Could not find %s in the LDAP"
 msgstr "Konnte %s nicht im LDAP finden"
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr "OPSI"
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr "OPSI-Profilverwaltung"
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr "Produkteigenschaften"
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr "Eigenschaften der Produkte von diesem Profil"
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -169,6 +190,19 @@ msgstr "Softwareliste welche mit diesem Profil installiert wird"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr "OPSI-Profilverwaltung"
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr "Produkteigenschaften"
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr "Eigenschaften der Produkte von diesem Profil"
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr "OPSI-Client"
@@ -206,11 +240,6 @@ msgstr "Konnte die MAC-Adresse des OPSI-Servers nicht finden !"
 msgid "Could not remove OPSI informations"
 msgstr "Konnte die OPSI-Informationen nicht löschen"
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr "Konnte die OPSI-Informationen nicht aktualisieren"
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -248,34 +277,6 @@ msgstr "Passwort"
 msgid "The password to use for connection"
 msgstr "Das Passwort für die Verbindung"
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr "OPSI-Import"
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr "Windows-Stationen von OPSI in FD importieren"
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr "Argonaut-Server ist nicht verfügbar"
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr "OPSI-Konfiguration"
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr "FusionDirectory OPSI-Plugin-Konfiguration"
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr "OPSI RDN"
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr "Zweig, in dem OPSI-Profile gespeichert werden"
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/el_GR/fusiondirectory.po b/opsi/locale/el_GR/fusiondirectory.po
index e62196cf51..82c7372afa 100644
--- a/opsi/locale/el_GR/fusiondirectory.po
+++ b/opsi/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -19,6 +19,50 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr "Εισαγωγή OPSI"
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr "Εισαγωγή σταθμών Windows από το OPSI στο FD"
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr "Δεν είναι διαθέσιμος ο διακομιστής Argonaut"
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr "Δεν υπάρχει διεύθυνση MAC"
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr "Αδύνατη η ενημέρωση των πληροφοριών OPSI"
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr "Διαμόρφωση OPSI"
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr "Διαμόρφωση του προσθέτου OPSI στο Fusion Directory"
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr "OPSI"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr "OPSI RDN"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr "Κλαδί στο οποίο θα αποθηκευτούν τα προφίλ OPSI"
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -47,8 +91,8 @@ msgstr "Ο διακομιστής OPSI που θα χρησιμοποιηθεί
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Όνομα"
 
@@ -94,16 +138,11 @@ msgid "The localboot products to install with this list"
 msgstr "Τα προϊόντα τοπικής εκκίνησης που θα εγκατασταθούν με αυτήν τη λίστα"
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή argonaut"
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr "Δεν υπάρχει διεύθυνση MAC"
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -117,29 +156,11 @@ msgid "Could not find %s in the LDAP"
 msgstr "Δεν βρέθηκε ο %s στον LDAP"
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr "Αποτυχία σύνδεσης στον διακομιστή OPSI"
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr "OPSI"
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr "Διαχείριση του OPSI προφίλ"
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr "Ιδιότητες προϊόντων"
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr "Οι ιδιότητες των προϊόντων σε αυτό το προφίλ"
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -170,6 +191,19 @@ msgstr "Λίστες λογισμικού που θα εγκατασταθεί 
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr "Διαχείριση του OPSI προφίλ"
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr "Ιδιότητες προϊόντων"
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr "Οι ιδιότητες των προϊόντων σε αυτό το προφίλ"
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr "Πελάτης OPSI"
@@ -207,11 +241,6 @@ msgstr "Αδύνατη η λήψη της διεύθυνσης MAC για τον
 msgid "Could not remove OPSI informations"
 msgstr "Αδύνατη η διαγραφή των πληροφοριών OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr "Αδύνατη η ενημέρωση των πληροφοριών OPSI"
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -249,34 +278,6 @@ msgstr "Κωδικός πρόσβασης:"
 msgid "The password to use for connection"
 msgstr "Ο κωδικός πρόσβασης που θα χρησιμοποιηθεί για τη σύνδεση"
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr "Εισαγωγή OPSI"
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr "Εισαγωγή σταθμών Windows από το OPSI στο FD"
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr "Δεν είναι διαθέσιμος ο διακομιστής Argonaut"
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr "Διαμόρφωση OPSI"
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr "Διαμόρφωση του προσθέτου OPSI στο Fusion Directory"
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr "OPSI RDN"
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr "Κλαδί στο οποίο θα αποθηκευτούν τα προφίλ OPSI"
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/es/fusiondirectory.po b/opsi/locale/es/fusiondirectory.po
index de47237ab7..1e49c93ff9 100644
--- a/opsi/locale/es/fusiondirectory.po
+++ b/opsi/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Nombre"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Contraseña"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/es_CO/fusiondirectory.po b/opsi/locale/es_CO/fusiondirectory.po
index 012671a45a..22e4f4d6e2 100644
--- a/opsi/locale/es_CO/fusiondirectory.po
+++ b/opsi/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Nombre"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Contraseña"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/es_VE/fusiondirectory.po b/opsi/locale/es_VE/fusiondirectory.po
index 7ad80fd851..ca2ba3359b 100644
--- a/opsi/locale/es_VE/fusiondirectory.po
+++ b/opsi/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Nombre"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Contraseña"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/fa_IR/fusiondirectory.po b/opsi/locale/fa_IR/fusiondirectory.po
index 222ed9d5bb..88ae699a56 100644
--- a/opsi/locale/fa_IR/fusiondirectory.po
+++ b/opsi/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:53+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr ""
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr ""
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/fi_FI/fusiondirectory.po b/opsi/locale/fi_FI/fusiondirectory.po
index f7880d4487..f6eea45614 100644
--- a/opsi/locale/fi_FI/fusiondirectory.po
+++ b/opsi/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:53+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Nimi"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Salasana"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/fr/fusiondirectory.po b/opsi/locale/fr/fusiondirectory.po
index ccf3a5ad64..45af98923c 100644
--- a/opsi/locale/fr/fusiondirectory.po
+++ b/opsi/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr "Importation OPSI"
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr "Importer les stations Windows de OPSI dans FD"
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr "Serveur Argonaut indisponible"
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr "Pas d'adresse mac"
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr "Mise à jour des informations OPSI impossible"
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr "Configuration OPSI"
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr "Configuration du plugin OPSI"
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr "OPSI"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr "Branche OPSI"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr "Branche où seront stockés les profils OPSI"
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -46,8 +90,8 @@ msgstr "Serveur OPSI à utiliser pour le déploiement"
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Nom"
 
@@ -93,16 +137,11 @@ msgid "The localboot products to install with this list"
 msgstr "Les produits localboot à installer avec cette liste"
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr "Impossible de contacter le serveur Argonaut"
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr "Pas d'adresse mac"
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -116,29 +155,11 @@ 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_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr "Impossible de contacter le serveur OPSI"
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr "OPSI"
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr "Gestion des profils OPSI"
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr "Propriétés du produit"
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr "Propriétés des produits de ce profil"
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -169,6 +190,19 @@ msgstr "Listes de logiciels qui seront installés avec ce profil"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr "Gestion des profils OPSI"
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr "Propriétés du produit"
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr "Propriétés des produits de ce profil"
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr "Client OPSI"
@@ -206,11 +240,6 @@ msgstr "Impossible d'obtenir l'adresse mac pour le serveur OPSI !"
 msgid "Could not remove OPSI informations"
 msgstr "Effacement des informations OPSI impossible"
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr "Mise à jour des informations OPSI impossible"
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -248,34 +277,6 @@ msgstr "Mot de passe"
 msgid "The password to use for connection"
 msgstr "Mot de passe à utiliser pour la connexion"
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr "Importation OPSI"
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr "Importer les stations Windows de OPSI dans FD"
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr "Serveur Argonaut indisponible"
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr "Configuration OPSI"
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr "Configuration du plugin OPSI"
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr "Branche OPSI"
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr "Branche où seront stockés les profils OPSI"
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/hu_HU/fusiondirectory.po b/opsi/locale/hu_HU/fusiondirectory.po
index 2af183ee3f..7faaa32ee0 100644
--- a/opsi/locale/hu_HU/fusiondirectory.po
+++ b/opsi/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:53+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Név"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr ""
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/id/fusiondirectory.po b/opsi/locale/id/fusiondirectory.po
index 4c47c19e7a..975ebf8d59 100644
--- a/opsi/locale/id/fusiondirectory.po
+++ b/opsi/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:53+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr ""
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr ""
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/it_IT/fusiondirectory.po b/opsi/locale/it_IT/fusiondirectory.po
index d7e2ac25d5..1b9421356d 100644
--- a/opsi/locale/it_IT/fusiondirectory.po
+++ b/opsi/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:26+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,6 +19,50 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr "Importazione da OPSI"
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr "Importare stazioni Windows da OPSI a FD"
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr "Il server Argonaut non è disponibile"
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr "Alcun indirizzo MAC"
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr "Impossibile aggiornare le informazioni di OPSI"
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr "Configurazione di OPSI"
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr "Configurazione del plugin OPSI per FusionDirectory"
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr "OPSI"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr "OPSI RDN"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr "Ramo nel quale saranno immagazzinati i profili di OPSI"
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -47,8 +91,8 @@ msgstr "Server OPSI da usare per la distribuzione"
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Nome"
 
@@ -94,16 +138,11 @@ msgid "The localboot products to install with this list"
 msgstr "I prodotti localboot da installare con questo elenco"
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr "Non posso contattare il server Argonaut"
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr "Alcun indirizzo MAC"
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -117,29 +156,11 @@ msgid "Could not find %s in the LDAP"
 msgstr "Impossibile trovare %s nell'annuario LDAP"
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr "Campo per contattare il server OPSI"
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr "OPSI"
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr "Gestione profilo OPSI"
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr "Proprietà del prodotto"
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr "Proprietà dei prodotti di questo profilo"
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -170,6 +191,19 @@ msgstr "Elenco dei software da installare con questo profilo"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr "Gestione profilo OPSI"
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr "Proprietà del prodotto"
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr "Proprietà dei prodotti di questo profilo"
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr "Cliente OPSI"
@@ -207,11 +241,6 @@ msgstr "Impossibile ottenere indirizzo MAC per il server OPSI"
 msgid "Could not remove OPSI informations"
 msgstr "Impossibile rimuovere informazioni su OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr "Impossibile aggiornare le informazioni di OPSI"
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -249,34 +278,6 @@ msgstr "Password"
 msgid "The password to use for connection"
 msgstr "La password da usare per la connessione"
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr "Importazione da OPSI"
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr "Importare stazioni Windows da OPSI a FD"
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr "Il server Argonaut non è disponibile"
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr "Configurazione di OPSI"
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr "Configurazione del plugin OPSI per FusionDirectory"
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr "OPSI RDN"
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr "Ramo nel quale saranno immagazzinati i profili di OPSI"
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/lv/fusiondirectory.po b/opsi/locale/lv/fusiondirectory.po
index d6f6dc0472..bca8e2ddfa 100644
--- a/opsi/locale/lv/fusiondirectory.po
+++ b/opsi/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Vārds "
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr ""
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/nb/fusiondirectory.po b/opsi/locale/nb/fusiondirectory.po
index 5e8aa76630..391d3b44bd 100644
--- a/opsi/locale/nb/fusiondirectory.po
+++ b/opsi/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Navn"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr ""
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/nl/fusiondirectory.po b/opsi/locale/nl/fusiondirectory.po
index 98ac2f1561..f0ddbe51e3 100644
--- a/opsi/locale/nl/fusiondirectory.po
+++ b/opsi/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Naam"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Wachtwoord"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/pl/fusiondirectory.po b/opsi/locale/pl/fusiondirectory.po
index 65cbe3898e..1e4aaca307 100644
--- a/opsi/locale/pl/fusiondirectory.po
+++ b/opsi/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "ImiÄ™"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Hasło"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/pt/fusiondirectory.po b/opsi/locale/pt/fusiondirectory.po
index 6f0c3dc707..d8adb15e82 100644
--- a/opsi/locale/pt/fusiondirectory.po
+++ b/opsi/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Nome"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Senha"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/pt_BR/fusiondirectory.po b/opsi/locale/pt_BR/fusiondirectory.po
index b41344d6d1..7419a6fa5b 100644
--- a/opsi/locale/pt_BR/fusiondirectory.po
+++ b/opsi/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr "Não foi possível atualizar informações OPSI"
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr "OPSI"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Nome"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr "OPSI"
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr "%s(%s)"
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr "Cliente OPSI"
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr "Não foi possível atualizar informações OPSI"
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Senha"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/ru/fusiondirectory.po b/opsi/locale/ru/fusiondirectory.po
index c8918cc154..40d2a12847 100644
--- a/opsi/locale/ru/fusiondirectory.po
+++ b/opsi/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,50 @@ 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"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr "OPSI"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Фамилия"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr "OPSI"
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Пароль"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/ru@petr1708/fusiondirectory.po b/opsi/locale/ru@petr1708/fusiondirectory.po
index a8abee94ac..1210e5d20a 100644
--- a/opsi/locale/ru@petr1708/fusiondirectory.po
+++ b/opsi/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:53+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,50 @@ 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"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr ""
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr ""
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/sv/fusiondirectory.po b/opsi/locale/sv/fusiondirectory.po
index d3aa6b2157..68ab509b2a 100644
--- a/opsi/locale/sv/fusiondirectory.po
+++ b/opsi/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr "OPSI"
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Namn"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr "OPSI"
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Lösenord"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/ug/fusiondirectory.po b/opsi/locale/ug/fusiondirectory.po
index 5ec758cb94..0e309e3efb 100644
--- a/opsi/locale/ug/fusiondirectory.po
+++ b/opsi/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:53+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr ""
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr ""
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/vi_VN/fusiondirectory.po b/opsi/locale/vi_VN/fusiondirectory.po
index 323bbe9fd3..268f7b7b74 100644
--- a/opsi/locale/vi_VN/fusiondirectory.po
+++ b/opsi/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "Tên"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "Mật khẩu"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/opsi/locale/zh/fusiondirectory.po b/opsi/locale/zh/fusiondirectory.po
index 699e563018..9c3e69413f 100644
--- a/opsi/locale/zh/fusiondirectory.po
+++ b/opsi/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:69
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:80
+#: admin/opsi/class_opsiSoftwareList.inc:122
+#: admin/opsi/class_opsiProfile.inc:167
+msgid "No mac address"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:95
+#: admin/systems/opsi/class_opsiClient.inc:150
+msgid "Could not update OPSI informations"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:42
+#: admin/opsi/class_opsiProfileManagement.inc:33
+msgid "OPSI"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
@@ -45,8 +89,8 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiProductProperties.inc:117
 msgid "Name"
 msgstr "名称"
 
@@ -92,16 +136,11 @@ msgid "The localboot products to install with this list"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiProductProperties.inc:176
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:80
-msgid "No mac address"
-msgstr ""
-
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
@@ -115,29 +154,11 @@ msgid "Could not find %s in the LDAP"
 msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiProductProperties.inc:192
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiProfileManagement.inc:33
-#: config/opsi/class_opsiConfig.inc:42
-msgid "OPSI"
-msgstr ""
-
-#: admin/opsi/class_opsiProfileManagement.inc:34
-msgid "OPSI profile management"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
-msgid "Product properties"
-msgstr ""
-
-#: admin/opsi/class_opsiProductProperties.inc:122
-msgid "Properties of the products of this profile"
-msgstr ""
-
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
@@ -168,6 +189,19 @@ msgstr ""
 msgid "%s (%s)"
 msgstr ""
 
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:104
+#: admin/opsi/class_opsiProductProperties.inc:105
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:122
+msgid "Properties of the products of this profile"
+msgstr ""
+
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
 msgstr ""
@@ -205,11 +239,6 @@ msgstr ""
 msgid "Could not remove OPSI informations"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:150
-#: addons/opsi/class_opsiImport.inc:95
-msgid "Could not update OPSI informations"
-msgstr ""
-
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
@@ -247,34 +276,6 @@ msgstr "口令"
 msgid "The password to use for connection"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
-msgid "OPSI import"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:31
-msgid "Import windows stations from OPSI into FD"
-msgstr ""
-
-#: addons/opsi/class_opsiImport.inc:69
-msgid "Argonaut server is not available"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:28
-msgid "OPSI configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:29
-msgid "FusionDirectory OPSI plugin configuration"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "OPSI RDN"
-msgstr ""
-
-#: config/opsi/class_opsiConfig.inc:45
-msgid "Branch in which OPSI profiles will be stored"
-msgstr ""
-
 #: addons/opsi/opsiimport.tpl.c:2
 msgid ""
 "Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
diff --git a/personal/locale/ar/fusiondirectory.po b/personal/locale/ar/fusiondirectory.po
index 15f722e821..9161bd78db 100644
--- a/personal/locale/ar/fusiondirectory.po
+++ b/personal/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/personal/locale/ca/fusiondirectory.po b/personal/locale/ca/fusiondirectory.po
index bac75e42f1..b70eb8bc6b 100644
--- a/personal/locale/ca/fusiondirectory.po
+++ b/personal/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/personal/locale/cs_CZ/fusiondirectory.po b/personal/locale/cs_CZ/fusiondirectory.po
index fefe767d44..251055f44e 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/personal/locale/de/fusiondirectory.po b/personal/locale/de/fusiondirectory.po
index 7257c46128..61c2889a0a 100644
--- a/personal/locale/de/fusiondirectory.po
+++ b/personal/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/personal/locale/el_GR/fusiondirectory.po b/personal/locale/el_GR/fusiondirectory.po
index 3cc397cb9d..9406398101 100644
--- a/personal/locale/el_GR/fusiondirectory.po
+++ b/personal/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/personal/locale/es/fusiondirectory.po b/personal/locale/es/fusiondirectory.po
index 805ab57d86..950a4f9e25 100644
--- a/personal/locale/es/fusiondirectory.po
+++ b/personal/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/personal/locale/es_CO/fusiondirectory.po b/personal/locale/es_CO/fusiondirectory.po
index 8a716ba491..3f680459ba 100644
--- a/personal/locale/es_CO/fusiondirectory.po
+++ b/personal/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/personal/locale/es_VE/fusiondirectory.po b/personal/locale/es_VE/fusiondirectory.po
index 46e1e162f8..e04ccdc674 100644
--- a/personal/locale/es_VE/fusiondirectory.po
+++ b/personal/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/personal/locale/fa_IR/fusiondirectory.po b/personal/locale/fa_IR/fusiondirectory.po
index 452db78d5f..a2b9115f69 100644
--- a/personal/locale/fa_IR/fusiondirectory.po
+++ b/personal/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/personal/locale/fi_FI/fusiondirectory.po b/personal/locale/fi_FI/fusiondirectory.po
index 262fc1af71..35ba3692e8 100644
--- a/personal/locale/fi_FI/fusiondirectory.po
+++ b/personal/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-01 11:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/personal/locale/fr/fusiondirectory.po b/personal/locale/fr/fusiondirectory.po
index a49908e28a..71fe5b5e14 100644
--- a/personal/locale/fr/fusiondirectory.po
+++ b/personal/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:21+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/personal/locale/hu_HU/fusiondirectory.po b/personal/locale/hu_HU/fusiondirectory.po
index 950402c21b..ed31a33f50 100644
--- a/personal/locale/hu_HU/fusiondirectory.po
+++ b/personal/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/personal/locale/id/fusiondirectory.po b/personal/locale/id/fusiondirectory.po
index fd5463232d..c082cc6a76 100644
--- a/personal/locale/id/fusiondirectory.po
+++ b/personal/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/personal/locale/it_IT/fusiondirectory.po b/personal/locale/it_IT/fusiondirectory.po
index a79123bf58..fe2379b8c7 100644
--- a/personal/locale/it_IT/fusiondirectory.po
+++ b/personal/locale/it_IT/fusiondirectory.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:26+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/personal/locale/lv/fusiondirectory.po b/personal/locale/lv/fusiondirectory.po
index 4356b83ced..cbfc261899 100644
--- a/personal/locale/lv/fusiondirectory.po
+++ b/personal/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/personal/locale/nb/fusiondirectory.po b/personal/locale/nb/fusiondirectory.po
index bff1767f64..725da2354c 100644
--- a/personal/locale/nb/fusiondirectory.po
+++ b/personal/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/personal/locale/nl/fusiondirectory.po b/personal/locale/nl/fusiondirectory.po
index 592e887706..7c7555d9d0 100644
--- a/personal/locale/nl/fusiondirectory.po
+++ b/personal/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/personal/locale/pl/fusiondirectory.po b/personal/locale/pl/fusiondirectory.po
index c33df0836b..69d1c066fe 100644
--- a/personal/locale/pl/fusiondirectory.po
+++ b/personal/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/personal/locale/pt/fusiondirectory.po b/personal/locale/pt/fusiondirectory.po
index fac026b9e6..12b0190e8c 100644
--- a/personal/locale/pt/fusiondirectory.po
+++ b/personal/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/personal/locale/pt_BR/fusiondirectory.po b/personal/locale/pt_BR/fusiondirectory.po
index c612bef92b..2fa6296e0a 100644
--- a/personal/locale/pt_BR/fusiondirectory.po
+++ b/personal/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/personal/locale/ru/fusiondirectory.po b/personal/locale/ru/fusiondirectory.po
index 69d7e892c8..28445a0808 100644
--- a/personal/locale/ru/fusiondirectory.po
+++ b/personal/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/personal/locale/ru@petr1708/fusiondirectory.po b/personal/locale/ru@petr1708/fusiondirectory.po
index d8fa959a94..486e518847 100644
--- a/personal/locale/ru@petr1708/fusiondirectory.po
+++ b/personal/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/personal/locale/sv/fusiondirectory.po b/personal/locale/sv/fusiondirectory.po
index bb4cc42cf6..4c46da7277 100644
--- a/personal/locale/sv/fusiondirectory.po
+++ b/personal/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/personal/locale/ug/fusiondirectory.po b/personal/locale/ug/fusiondirectory.po
index 5093b69ce1..55c4c1338c 100644
--- a/personal/locale/ug/fusiondirectory.po
+++ b/personal/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/personal/locale/vi_VN/fusiondirectory.po b/personal/locale/vi_VN/fusiondirectory.po
index d7bfc59df0..fb193df51a 100644
--- a/personal/locale/vi_VN/fusiondirectory.po
+++ b/personal/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/personal/locale/zh/fusiondirectory.po b/personal/locale/zh/fusiondirectory.po
index 89733d2b44..2fcada3ec2 100644
--- a/personal/locale/zh/fusiondirectory.po
+++ b/personal/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-11 19:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/postfix/locale/ar/fusiondirectory.po b/postfix/locale/ar/fusiondirectory.po
index 3240fdd46d..dfca853517 100644
--- a/postfix/locale/ar/fusiondirectory.po
+++ b/postfix/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/postfix/locale/ca/fusiondirectory.po b/postfix/locale/ca/fusiondirectory.po
index 520a31892e..847159d308 100644
--- a/postfix/locale/ca/fusiondirectory.po
+++ b/postfix/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/postfix/locale/cs_CZ/fusiondirectory.po b/postfix/locale/cs_CZ/fusiondirectory.po
index 97635904ad..5c2b449a4a 100644
--- a/postfix/locale/cs_CZ/fusiondirectory.po
+++ b/postfix/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/postfix/locale/de/fusiondirectory.po b/postfix/locale/de/fusiondirectory.po
index d5d55e06f5..282ec5921e 100644
--- a/postfix/locale/de/fusiondirectory.po
+++ b/postfix/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/postfix/locale/el_GR/fusiondirectory.po b/postfix/locale/el_GR/fusiondirectory.po
index e86c1ef9a5..033bc66ea0 100644
--- a/postfix/locale/el_GR/fusiondirectory.po
+++ b/postfix/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/postfix/locale/es/fusiondirectory.po b/postfix/locale/es/fusiondirectory.po
index ea6dd0efc2..2b9e71ad12 100644
--- a/postfix/locale/es/fusiondirectory.po
+++ b/postfix/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/postfix/locale/es_CO/fusiondirectory.po b/postfix/locale/es_CO/fusiondirectory.po
index d3235c436f..18317405a7 100644
--- a/postfix/locale/es_CO/fusiondirectory.po
+++ b/postfix/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/postfix/locale/es_VE/fusiondirectory.po b/postfix/locale/es_VE/fusiondirectory.po
index 4bf0011708..94bafbcdec 100644
--- a/postfix/locale/es_VE/fusiondirectory.po
+++ b/postfix/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/postfix/locale/fa_IR/fusiondirectory.po b/postfix/locale/fa_IR/fusiondirectory.po
index 300ea21783..a362f9ca98 100644
--- a/postfix/locale/fa_IR/fusiondirectory.po
+++ b/postfix/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/postfix/locale/fi_FI/fusiondirectory.po b/postfix/locale/fi_FI/fusiondirectory.po
index beb58c8c60..a7598ce6cb 100644
--- a/postfix/locale/fi_FI/fusiondirectory.po
+++ b/postfix/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/postfix/locale/fr/fusiondirectory.po b/postfix/locale/fr/fusiondirectory.po
index 8b2826ed32..60951198d3 100644
--- a/postfix/locale/fr/fusiondirectory.po
+++ b/postfix/locale/fr/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/postfix/locale/hu_HU/fusiondirectory.po b/postfix/locale/hu_HU/fusiondirectory.po
index 604f83eab2..f0a6ed791f 100644
--- a/postfix/locale/hu_HU/fusiondirectory.po
+++ b/postfix/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/postfix/locale/id/fusiondirectory.po b/postfix/locale/id/fusiondirectory.po
index 6249aad7e9..74e2c3cded 100644
--- a/postfix/locale/id/fusiondirectory.po
+++ b/postfix/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/postfix/locale/it_IT/fusiondirectory.po b/postfix/locale/it_IT/fusiondirectory.po
index 3ac241c227..4b2f6c98e9 100644
--- a/postfix/locale/it_IT/fusiondirectory.po
+++ b/postfix/locale/it_IT/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/postfix/locale/lv/fusiondirectory.po b/postfix/locale/lv/fusiondirectory.po
index 460a14db67..95ea10ec75 100644
--- a/postfix/locale/lv/fusiondirectory.po
+++ b/postfix/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/postfix/locale/nb/fusiondirectory.po b/postfix/locale/nb/fusiondirectory.po
index e76cfa9c5f..052768f624 100644
--- a/postfix/locale/nb/fusiondirectory.po
+++ b/postfix/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/postfix/locale/nl/fusiondirectory.po b/postfix/locale/nl/fusiondirectory.po
index 39ffa0cd23..d392c5240a 100644
--- a/postfix/locale/nl/fusiondirectory.po
+++ b/postfix/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/postfix/locale/pl/fusiondirectory.po b/postfix/locale/pl/fusiondirectory.po
index 02129a959d..6ada1ae949 100644
--- a/postfix/locale/pl/fusiondirectory.po
+++ b/postfix/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/postfix/locale/pt/fusiondirectory.po b/postfix/locale/pt/fusiondirectory.po
index a835267b2e..f524b1f2b0 100644
--- a/postfix/locale/pt/fusiondirectory.po
+++ b/postfix/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/postfix/locale/pt_BR/fusiondirectory.po b/postfix/locale/pt_BR/fusiondirectory.po
index aac3223551..4016d26cee 100644
--- a/postfix/locale/pt_BR/fusiondirectory.po
+++ b/postfix/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/postfix/locale/ru/fusiondirectory.po b/postfix/locale/ru/fusiondirectory.po
index 659b503094..1b23dcc3b4 100644
--- a/postfix/locale/ru/fusiondirectory.po
+++ b/postfix/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/postfix/locale/ru@petr1708/fusiondirectory.po b/postfix/locale/ru@petr1708/fusiondirectory.po
index 2d18a0e93f..6f9f3ff7b1 100644
--- a/postfix/locale/ru@petr1708/fusiondirectory.po
+++ b/postfix/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/postfix/locale/sv/fusiondirectory.po b/postfix/locale/sv/fusiondirectory.po
index 495d467666..0918263004 100644
--- a/postfix/locale/sv/fusiondirectory.po
+++ b/postfix/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/postfix/locale/ug/fusiondirectory.po b/postfix/locale/ug/fusiondirectory.po
index c63ed3a287..d0657c1373 100644
--- a/postfix/locale/ug/fusiondirectory.po
+++ b/postfix/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/postfix/locale/vi_VN/fusiondirectory.po b/postfix/locale/vi_VN/fusiondirectory.po
index 16284a46ac..023e9c18df 100644
--- a/postfix/locale/vi_VN/fusiondirectory.po
+++ b/postfix/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/postfix/locale/zh/fusiondirectory.po b/postfix/locale/zh/fusiondirectory.po
index e81e492c79..e1c1bff27c 100644
--- a/postfix/locale/zh/fusiondirectory.po
+++ b/postfix/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:07+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/ppolicy/locale/ar/fusiondirectory.po b/ppolicy/locale/ar/fusiondirectory.po
index cd88a6908c..6086d0a902 100644
--- a/ppolicy/locale/ar/fusiondirectory.po
+++ b/ppolicy/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/ca/fusiondirectory.po b/ppolicy/locale/ca/fusiondirectory.po
index 2c7748ff53..9b6c0d6515 100644
--- a/ppolicy/locale/ca/fusiondirectory.po
+++ b/ppolicy/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Error de la configuració"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Error de la configuració"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/cs_CZ/fusiondirectory.po b/ppolicy/locale/cs_CZ/fusiondirectory.po
index 24a2af59ed..f6fadb66ae 100644
--- a/ppolicy/locale/cs_CZ/fusiondirectory.po
+++ b/ppolicy/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -18,6 +18,133 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr "Zásada hesel"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr "Upravit zásady hesel uživatelů"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr "Zásada"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr "Pro tohoto uživatele použít zvláštní zásady"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr "Heslo bylo naposledy změněno"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr "Kdy bylo heslo k této položce změněno naposledy"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr "Doba, po kterou je účet uzamčen"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr "Okamžik zamčení účtu"
+
+#: 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 "Použít výchozí"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr "Nikdy"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr "Odemčeno"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr "Zásada hesel"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr "Statistiky uživatelských účtů, kterým ppolicy ukončilo platnost"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr "Účty, jejichž platnost skončila"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr "Uzamčené účty"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Chyba v nastavení"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr "Výchozí ppolicy %s nebyla v LDAP nalezena!"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr "Zásada Ppolicy %s, nastavená pro uživatele %s nebyla v LDAP nalezena!"
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr "Nastavení zásuvného modulu ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr "Nastavení zásuvného modulu ppolicy pro FusionDirectory"
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr "Zásuvný modul ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr "Relativní rozlišený název ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr "Větev, ve které budou ukládána pravidla ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr "Běžný název výchozí ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr "Co umístíte jako výchozí ppolicy do nastavení překrytí"
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr "Zásady hesel"
@@ -26,21 +153,10 @@ msgstr "Zásady hesel"
 msgid "Password policies management"
 msgstr "Správa zásad hesel"
 
-#: 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 "Zásada hesel"
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr "Pravidla pro hesla pro překrytí ppolicy"
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr "Zásada"
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr "Název zásady"
@@ -215,122 +331,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr "Zda uživatele přimět ke změně hesla po obnovení přístupu správcem po samočinném zamčení účtu"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr "Zásada hesel"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr "Statistiky uživatelských účtů, kterým ppolicy ukončilo platnost"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr "Účty, jejichž platnost skončila"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr "Uzamčené účty"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Chyba v nastavení"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr "Výchozí ppolicy %s nebyla v LDAP nalezena!"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr "Zásada Ppolicy %s, nastavená pro uživatele %s nebyla v LDAP nalezena!"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr "Upravit zásady hesel uživatelů"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr "Pro tohoto uživatele použít zvláštní zásady"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr "Heslo bylo naposledy změněno"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr "Kdy bylo heslo k této položce změněno naposledy"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr "Doba, po kterou je účet uzamčen"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr "Okamžik zamčení účtu"
-
-#: 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 "Použít výchozí"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr "Nikdy"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr "Odemčeno"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr "Nastavení zásuvného modulu ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr "Nastavení zásuvného modulu ppolicy pro FusionDirectory"
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr "Zásuvný modul ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr "Relativní rozlišený název ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr "Větev, ve které budou ukládána pravidla ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr "Běžný název výchozí ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr "Co umístíte jako výchozí ppolicy do nastavení překrytí"
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/de/fusiondirectory.po b/ppolicy/locale/de/fusiondirectory.po
index de4051912d..4ccfd7960b 100644
--- a/ppolicy/locale/de/fusiondirectory.po
+++ b/ppolicy/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,133 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr "Passwortrichtlinie"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr "Passwortrichtlinie des Benutzers bearbeiten"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr "Richtlinie"
+
+#: 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 "Letzte Passwortänderung"
+
+#: 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 "Kontosperrzeit"
+
+#: 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 "Standard verwenden"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr "Nie"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr "Entsperrt"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr "Abgelaufene Konten"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr "Gesperrte Konten"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Konfigurationsfehler"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr "Passwortrichtlinien"
@@ -26,21 +153,10 @@ msgstr "Passwortrichtlinien"
 msgid "Password policies management"
 msgstr "Passwortrichtlinienverwaltung"
 
-#: 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 "Passwortrichtlinie"
-
 #: 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 "Richtlinie"
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr "Richtlinienname"
@@ -215,122 +331,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr "Abgelaufene Konten"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr "Gesperrte Konten"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Konfigurationsfehler"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr "Passwortrichtlinie des Benutzers bearbeiten"
-
-#: 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 "Letzte Passwortänderung"
-
-#: 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 "Kontosperrzeit"
-
-#: 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 "Standard verwenden"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr "Nie"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr "Entsperrt"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/el_GR/fusiondirectory.po b/ppolicy/locale/el_GR/fusiondirectory.po
index 7a10203739..54df84a754 100644
--- a/ppolicy/locale/el_GR/fusiondirectory.po
+++ b/ppolicy/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -19,6 +19,133 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr "Πολιτική κωδικών πρόσβασης"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr "Επεξεργασία πολιτικής κωδικού χρήστη"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr "Πολιτική"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr "Χρήση μιας συγκεκριμένης πολιτικής για αυτόν τον χρήστη"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr "Τελευταία αλλαγή κωδικού"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr "Τελευταία φορά που έχει γίνει αλλαγή κωδικού"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr "Χρόνος κλειδωμένου λογαριασμού"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr "Χρόνος που ήταν κλειδωμένος ο λογαριασμός"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr "Χρήση προεπιλογής"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr "Ποτέ"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr "Ξεκλειδωμένος"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr "Ppolicy"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr "Στατιστικά για τους χρήστες ppolicy που έχουν λήξει"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr "Λογαριασμοί που έχουν λήξει"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr "Κλειδωμένοι λογαριασμοί"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Σφάλμα ρύθμισης"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr "Δεν ήταν δυνατή η εύρεση του Ppolicy \"%s\" στο LDAP!"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr "Η Ppolicy \"%s\" που έχει οριστεί για χρήστη \"%s\" δεν μπορεί να βρεθεί στο LDAP!"
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr "Ρύθμιση προσθέτου Ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr "Πρόσθετο Ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr "Ppolicy RDN"
+
+#: 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 "Προεπιλογμένη ppolicy cn"
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr "Πολιτικές κωδικών πρόσβασης"
@@ -27,21 +154,10 @@ msgstr "Πολιτικές κωδικών πρόσβασης"
 msgid "Password policies management"
 msgstr "Διαχείριση πολιτικών κωδικών πρόσβασης"
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr "Πολιτική κωδικών πρόσβασης"
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr "Πολιτική κωδικών πρόσβασης για το ppolicy overlay"
 
-#: 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 "Όνομα πολιτικής"
@@ -216,122 +332,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr "Ppolicy"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr "Στατιστικά για τους χρήστες ppolicy που έχουν λήξει"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr "Λογαριασμοί που έχουν λήξει"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr "Κλειδωμένοι λογαριασμοί"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Σφάλμα ρύθμισης"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr "Δεν ήταν δυνατή η εύρεση του Ppolicy \"%s\" στο LDAP!"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr "Η Ppolicy \"%s\" που έχει οριστεί για χρήστη \"%s\" δεν μπορεί να βρεθεί στο LDAP!"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr "Επεξεργασία πολιτικής κωδικού χρήστη"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr "Χρήση μιας συγκεκριμένης πολιτικής για αυτόν τον χρήστη"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr "Τελευταία αλλαγή κωδικού"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr "Τελευταία φορά που έχει γίνει αλλαγή κωδικού"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr "Χρόνος κλειδωμένου λογαριασμού"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr "Χρόνος που ήταν κλειδωμένος ο λογαριασμός"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr "Χρήση προεπιλογής"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr "Ποτέ"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr "Ξεκλειδωμένος"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr "Ρύθμιση προσθέτου Ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr "Πρόσθετο Ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr "Ppolicy RDN"
-
-#: 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 "Προεπιλογμένη ppolicy cn"
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/es/fusiondirectory.po b/ppolicy/locale/es/fusiondirectory.po
index d0ace5efce..e8bbc0a4d6 100644
--- a/ppolicy/locale/es/fusiondirectory.po
+++ b/ppolicy/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Error en la configuración"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Error en la configuración"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/es_CO/fusiondirectory.po b/ppolicy/locale/es_CO/fusiondirectory.po
index e6fdd53f35..83d85dc63f 100644
--- a/ppolicy/locale/es_CO/fusiondirectory.po
+++ b/ppolicy/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr "Cuentas expiradas"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Error de configuración"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr "Cuentas expiradas"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Error de configuración"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/es_VE/fusiondirectory.po b/ppolicy/locale/es_VE/fusiondirectory.po
index 2d62e09621..1164d4f315 100644
--- a/ppolicy/locale/es_VE/fusiondirectory.po
+++ b/ppolicy/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Error en la configuración"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Error en la configuración"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/fa_IR/fusiondirectory.po b/ppolicy/locale/fa_IR/fusiondirectory.po
index 87968d6197..4c3f528e0e 100644
--- a/ppolicy/locale/fa_IR/fusiondirectory.po
+++ b/ppolicy/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/fi_FI/fusiondirectory.po b/ppolicy/locale/fi_FI/fusiondirectory.po
index eb7c2f18a4..d5094ba55f 100644
--- a/ppolicy/locale/fi_FI/fusiondirectory.po
+++ b/ppolicy/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/fr/fusiondirectory.po b/ppolicy/locale/fr/fusiondirectory.po
index b890e54c4b..4fee99f63d 100644
--- a/ppolicy/locale/fr/fusiondirectory.po
+++ b/ppolicy/locale/fr/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 07:07+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -20,6 +20,133 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr "Politique de mot de passe"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr "Éditer la politique de mot de passe de l'utilisateur"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr "Politique"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr "Utiliser une politique spécifique pour cet utilisateur"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr "Dernier changement de mot de passe"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr "La dernière fois que le mot de passe pour l'entrée a été changé"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr "Heure de verrouillage du compte"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr "A quel moment le compte a été verrouillé "
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr "Réinitialiser verrouillage / changement obligatoire"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr "Réinitialise l'état de verrouillage de ce compte et / ou imposer un changement de mot de passe"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr "Force de changement de mot de passe (réinitialise le verrouillage)"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr "Réinitialiser le verrouillage (même mot de passe)"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr "Utiliser les réglages par défaut"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr "Jamais"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr "Déverrouillé"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr "Verrouillé de façon permanente"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr "Ppolicy"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr "Statistiques sur les utilisateurs ppolicy expirés"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr "Comptes expirés"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr "Comptes verrouillés "
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Erreur de configuration"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr "La ppolicy par défaut \"%s\" n’a pas été trouvée dans le LDAP !"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr "La ppolicy \"%s\" pour l'utilisateur \"%s\" n’a pas été trouvée dans le LDAP !"
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr "Configuration du plugin Ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr "Configuration du plugin Ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr "Plugin Ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr "Branche Ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr "Branche dans laquelle les politiques de mot de passe seront stockées"
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr "Cn de la politique par défaut"
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr "Ce que vous mettez comme politique par défaut dans la configuration de l'overlay"
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr "Politiques de mot de passe"
@@ -28,21 +155,10 @@ msgstr "Politiques de mot de passe"
 msgid "Password policies management"
 msgstr "Gestion des politiques de mot de passe"
 
-#: 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 "Politique de mot de passe"
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr "Politiques de mot de passe pour l'overlay ppolicy"
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr "Politique"
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr "Nom de la politique"
@@ -217,122 +333,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr "Si l'utilisateur doit changer son mot de passe après qu'un compte aie été réinitialisé par un administrateur suite à un verrouillage automatique"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr "Ppolicy"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr "Statistiques sur les utilisateurs ppolicy expirés"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr "Comptes expirés"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr "Comptes verrouillés "
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Erreur de configuration"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr "La ppolicy par défaut \"%s\" n’a pas été trouvée dans le LDAP !"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr "La ppolicy \"%s\" pour l'utilisateur \"%s\" n’a pas été trouvée dans le LDAP !"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr "Éditer la politique de mot de passe de l'utilisateur"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr "Utiliser une politique spécifique pour cet utilisateur"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr "Dernier changement de mot de passe"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr "La dernière fois que le mot de passe pour l'entrée a été changé"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr "Heure de verrouillage du compte"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr "A quel moment le compte a été verrouillé "
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr "Réinitialiser verrouillage / changement obligatoire"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr "Réinitialise l'état de verrouillage de ce compte et / ou imposer un changement de mot de passe"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr "Force de changement de mot de passe (réinitialise le verrouillage)"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr "Réinitialiser le verrouillage (même mot de passe)"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr "Utiliser les réglages par défaut"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr "Jamais"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr "Déverrouillé"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr "Verrouillé de façon permanente"
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr "Configuration du plugin Ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr "Configuration du plugin Ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr "Plugin Ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr "Branche Ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr "Branche dans laquelle les politiques de mot de passe seront stockées"
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr "Cn de la politique par défaut"
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr "Ce que vous mettez comme politique par défaut dans la configuration de l'overlay"
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/hu_HU/fusiondirectory.po b/ppolicy/locale/hu_HU/fusiondirectory.po
index 12ef7cd8b2..cade334768 100644
--- a/ppolicy/locale/hu_HU/fusiondirectory.po
+++ b/ppolicy/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/id/fusiondirectory.po b/ppolicy/locale/id/fusiondirectory.po
index 76e645d3ba..fe8b61e6a5 100644
--- a/ppolicy/locale/id/fusiondirectory.po
+++ b/ppolicy/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/it_IT/fusiondirectory.po b/ppolicy/locale/it_IT/fusiondirectory.po
index c674b9caca..6705d7e34d 100644
--- a/ppolicy/locale/it_IT/fusiondirectory.po
+++ b/ppolicy/locale/it_IT/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:26+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -20,6 +20,133 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr "Regola per la password"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr "Modifica la politica del cambio password per l'utente"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr "Regola"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr "Usa una politica specifica per questo utente"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr "Ultima modifica della password"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr "L'ultima volta in cui la password per le voci é stata cambiata"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr "Tempo di blocco dell'account"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr "Data del blocco dell'account"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr "Ripristino di bloccaggio / forza le modifiche"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr "Ripristina lo stato di blocco del conto e/o imponi una modifica della password"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr "Forza la modifica della password (ripristina bloccaggio)"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr "Ripristino di bloccaggio (stessa password)"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr "Usa il default"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr "Mai"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr "Sbloccato"
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr "Bloccato in modo permanente"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr "Ppolicy"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr "Statistiche sugli utenti ppolicy scaduti"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr "Account scaduti"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr "Account bloccati"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Errore di configurazione"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr "La ppolicy \"%s\" predefinta non é stata trovata nell'annuario LDAP"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr "La ppolicy  \"%s\" impostata per l'utente  \"%s\"  non é stata trovata nell'LDAP!"
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr "Configurazione del plugin Ppolicy"
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr "Configurazione del plugin ppolicy di FusionDirectory"
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr "Ppolicy plugin"
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr "Ppolicy RDN"
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr "Ramo nel quale verranno immagazinate ppolicies"
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr "Cn di ppolicy predefinito"
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr "Ciò che si mette come ppolicy default nella configurazione di sovrapposizione"
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr "Regole per la password"
@@ -28,21 +155,10 @@ msgstr "Regole per la password"
 msgid "Password policies management"
 msgstr "Gestione delle regole per la password"
 
-#: 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 "Regola per la password"
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr "Regole per la password"
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr "Regola"
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr "Nome della regola"
@@ -217,122 +333,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr "L'utente deve cambiare la propria password dopo il reset dell'account da parte di un amministratore in seguito ad un blocco automatico"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr "Ppolicy"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr "Statistiche sugli utenti ppolicy scaduti"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr "Account scaduti"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr "Account bloccati"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Errore di configurazione"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr "La ppolicy \"%s\" predefinta non é stata trovata nell'annuario LDAP"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr "La ppolicy  \"%s\" impostata per l'utente  \"%s\"  non é stata trovata nell'LDAP!"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr "Modifica la politica del cambio password per l'utente"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr "Usa una politica specifica per questo utente"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr "Ultima modifica della password"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr "L'ultima volta in cui la password per le voci é stata cambiata"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr "Tempo di blocco dell'account"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr "Data del blocco dell'account"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr "Ripristino di bloccaggio / forza le modifiche"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr "Ripristina lo stato di blocco del conto e/o imponi una modifica della password"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr "Forza la modifica della password (ripristina bloccaggio)"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr "Ripristino di bloccaggio (stessa password)"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr "Usa il default"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr "Mai"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr "Sbloccato"
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr "Bloccato in modo permanente"
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr "Configurazione del plugin Ppolicy"
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr "Configurazione del plugin ppolicy di FusionDirectory"
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr "Ppolicy plugin"
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr "Ppolicy RDN"
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr "Ramo nel quale verranno immagazinate ppolicies"
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr "Cn di ppolicy predefinito"
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr "Ciò che si mette come ppolicy default nella configurazione di sovrapposizione"
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/lv/fusiondirectory.po b/ppolicy/locale/lv/fusiondirectory.po
index b675c0b95c..ede6e298ce 100644
--- a/ppolicy/locale/lv/fusiondirectory.po
+++ b/ppolicy/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/nb/fusiondirectory.po b/ppolicy/locale/nb/fusiondirectory.po
index 055930238a..ff4cefa3cb 100644
--- a/ppolicy/locale/nb/fusiondirectory.po
+++ b/ppolicy/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/nl/fusiondirectory.po b/ppolicy/locale/nl/fusiondirectory.po
index 4f83e7b7f5..5ba113f664 100644
--- a/ppolicy/locale/nl/fusiondirectory.po
+++ b/ppolicy/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Configuratie fout"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Configuratie fout"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/pl/fusiondirectory.po b/ppolicy/locale/pl/fusiondirectory.po
index fe8176e5a9..1f648aa680 100644
--- a/ppolicy/locale/pl/fusiondirectory.po
+++ b/ppolicy/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Błąd konfiguracji"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Błąd konfiguracji"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/pt/fusiondirectory.po b/ppolicy/locale/pt/fusiondirectory.po
index e8efd9e430..01bc5dd46b 100644
--- a/ppolicy/locale/pt/fusiondirectory.po
+++ b/ppolicy/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Erro de configuração"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Erro de configuração"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/pt_BR/fusiondirectory.po b/ppolicy/locale/pt_BR/fusiondirectory.po
index c67f69b5ac..da1d0d6fd5 100644
--- a/ppolicy/locale/pt_BR/fusiondirectory.po
+++ b/ppolicy/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr "Contas expiradas"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Erro de configuração"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr "Contas expiradas"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Erro de configuração"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/ru/fusiondirectory.po b/ppolicy/locale/ru/fusiondirectory.po
index eff1ae6d2e..83cde3ff28 100644
--- a/ppolicy/locale/ru/fusiondirectory.po
+++ b/ppolicy/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr "Просроченные учетные записи"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Ошибка конфигурации"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr "Просроченные учетные записи"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Ошибка конфигурации"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/ru@petr1708/fusiondirectory.po b/ppolicy/locale/ru@petr1708/fusiondirectory.po
index 9155193051..b15a8cb18a 100644
--- a/ppolicy/locale/ru@petr1708/fusiondirectory.po
+++ b/ppolicy/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/sv/fusiondirectory.po b/ppolicy/locale/sv/fusiondirectory.po
index 70243930ad..52148dd3ee 100644
--- a/ppolicy/locale/sv/fusiondirectory.po
+++ b/ppolicy/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Konfigurationsfel"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Konfigurationsfel"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/ug/fusiondirectory.po b/ppolicy/locale/ug/fusiondirectory.po
index e63a7c46e9..aab3a110ae 100644
--- a/ppolicy/locale/ug/fusiondirectory.po
+++ b/ppolicy/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/vi_VN/fusiondirectory.po b/ppolicy/locale/vi_VN/fusiondirectory.po
index fef8cf7bc3..c10bb77b15 100644
--- a/ppolicy/locale/vi_VN/fusiondirectory.po
+++ b/ppolicy/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr "Lỗi cấu hình"
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr "Lỗi cấu hình"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/ppolicy/locale/zh/fusiondirectory.po b/ppolicy/locale/zh/fusiondirectory.po
index 5f5e3563e1..b818540f8c 100644
--- a/ppolicy/locale/zh/fusiondirectory.po
+++ b/ppolicy/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-02 06:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,133 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+msgid "Password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+#: admin/ppolicy/class_ppolicy.inc:51
+msgid "Policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:39
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:44
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:71
+#: addons/dashboard/class_dashBoardPPolicy.inc:126
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:72
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
 msgstr ""
@@ -25,21 +152,10 @@ msgstr ""
 msgid "Password policies management"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
-#: personal/ppolicy/class_ppolicyAccount.inc:29
-#: personal/ppolicy/class_ppolicyAccount.inc:44
-msgid "Password policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:33
 msgid "Password policy for ppolicy overlay"
 msgstr ""
 
-#: admin/ppolicy/class_ppolicy.inc:51
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Policy"
-msgstr ""
-
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
 msgstr ""
@@ -214,122 +330,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:28
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:39
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:44
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:126
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:72
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:30
-msgid "Edit user's password policy"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:47
-msgid "Use a specific policy for this user"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:51
-msgid "Last time the password for the entry was changed"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Account locked time"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:55
-msgid "Time the account was locked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Reset locking / force change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:59
-msgid "Resets the lock status of this account and/or force a password change"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Force password change (resets locking)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:62
-msgid "Reset locking (same password)"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:77
-msgid "Use the default"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:83
-msgid "Never"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:90
-msgid "Unlocked"
-msgstr ""
-
-#: personal/ppolicy/class_ppolicyAccount.inc:92
-msgid "Locked permanently"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:29
-msgid "Ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:30
-msgid "FusionDirectory ppolicy plugin configuration"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:43
-msgid "Ppolicy plugin"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Ppolicy RDN"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:46
-msgid "Branch in which ppolicies will be stored"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "Default ppolicy cn"
-msgstr ""
-
-#: config/ppolicy/class_ppolicyConfig.inc:51
-msgid "What you put as default ppolicy in the overlay config"
-msgstr ""
-
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
diff --git a/puppet/locale/ar/fusiondirectory.po b/puppet/locale/ar/fusiondirectory.po
index 0b48303182..abb8c329e3 100644
--- a/puppet/locale/ar/fusiondirectory.po
+++ b/puppet/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/puppet/locale/ca/fusiondirectory.po b/puppet/locale/ca/fusiondirectory.po
index 4628c48701..1ede05d655 100644
--- a/puppet/locale/ca/fusiondirectory.po
+++ b/puppet/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/puppet/locale/cs_CZ/fusiondirectory.po b/puppet/locale/cs_CZ/fusiondirectory.po
index 925de4cdb5..5925550374 100644
--- a/puppet/locale/cs_CZ/fusiondirectory.po
+++ b/puppet/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/puppet/locale/de/fusiondirectory.po b/puppet/locale/de/fusiondirectory.po
index 9fa77d9cb7..684b81f365 100644
--- a/puppet/locale/de/fusiondirectory.po
+++ b/puppet/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/puppet/locale/el_GR/fusiondirectory.po b/puppet/locale/el_GR/fusiondirectory.po
index b618462741..51ca8ebc96 100644
--- a/puppet/locale/el_GR/fusiondirectory.po
+++ b/puppet/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/puppet/locale/es/fusiondirectory.po b/puppet/locale/es/fusiondirectory.po
index d59bdde18a..ab31777860 100644
--- a/puppet/locale/es/fusiondirectory.po
+++ b/puppet/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/puppet/locale/es_CO/fusiondirectory.po b/puppet/locale/es_CO/fusiondirectory.po
index 92582f5efb..e462d28f29 100644
--- a/puppet/locale/es_CO/fusiondirectory.po
+++ b/puppet/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/puppet/locale/es_VE/fusiondirectory.po b/puppet/locale/es_VE/fusiondirectory.po
index 214553b3cd..291121c3df 100644
--- a/puppet/locale/es_VE/fusiondirectory.po
+++ b/puppet/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/puppet/locale/fa_IR/fusiondirectory.po b/puppet/locale/fa_IR/fusiondirectory.po
index f6e7cb84fe..09f4e4db67 100644
--- a/puppet/locale/fa_IR/fusiondirectory.po
+++ b/puppet/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/puppet/locale/fi_FI/fusiondirectory.po b/puppet/locale/fi_FI/fusiondirectory.po
index 65287b3a8f..c98af8a6ad 100644
--- a/puppet/locale/fi_FI/fusiondirectory.po
+++ b/puppet/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/puppet/locale/fr/fusiondirectory.po b/puppet/locale/fr/fusiondirectory.po
index 62e021647e..c4c84793ba 100644
--- a/puppet/locale/fr/fusiondirectory.po
+++ b/puppet/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/puppet/locale/hu_HU/fusiondirectory.po b/puppet/locale/hu_HU/fusiondirectory.po
index 5e1d67ae2d..f366b91ef7 100644
--- a/puppet/locale/hu_HU/fusiondirectory.po
+++ b/puppet/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/puppet/locale/id/fusiondirectory.po b/puppet/locale/id/fusiondirectory.po
index 8c862bf4f9..550fb9a8e7 100644
--- a/puppet/locale/id/fusiondirectory.po
+++ b/puppet/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/puppet/locale/it_IT/fusiondirectory.po b/puppet/locale/it_IT/fusiondirectory.po
index 06343eb16e..868bb03093 100644
--- a/puppet/locale/it_IT/fusiondirectory.po
+++ b/puppet/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:27+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/puppet/locale/lv/fusiondirectory.po b/puppet/locale/lv/fusiondirectory.po
index 1459e57df9..a5e147a4c8 100644
--- a/puppet/locale/lv/fusiondirectory.po
+++ b/puppet/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/puppet/locale/nb/fusiondirectory.po b/puppet/locale/nb/fusiondirectory.po
index a944736404..d23e7d26a3 100644
--- a/puppet/locale/nb/fusiondirectory.po
+++ b/puppet/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/puppet/locale/nl/fusiondirectory.po b/puppet/locale/nl/fusiondirectory.po
index bdc05e97c1..aeeacd9b37 100644
--- a/puppet/locale/nl/fusiondirectory.po
+++ b/puppet/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/puppet/locale/pl/fusiondirectory.po b/puppet/locale/pl/fusiondirectory.po
index 17c7631572..9f02c8dc52 100644
--- a/puppet/locale/pl/fusiondirectory.po
+++ b/puppet/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/puppet/locale/pt/fusiondirectory.po b/puppet/locale/pt/fusiondirectory.po
index 93ddc66910..5e632c57ae 100644
--- a/puppet/locale/pt/fusiondirectory.po
+++ b/puppet/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/puppet/locale/pt_BR/fusiondirectory.po b/puppet/locale/pt_BR/fusiondirectory.po
index eace1e50e1..100be0fee9 100644
--- a/puppet/locale/pt_BR/fusiondirectory.po
+++ b/puppet/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/puppet/locale/ru/fusiondirectory.po b/puppet/locale/ru/fusiondirectory.po
index 4dc3e406dc..a13d1e4602 100644
--- a/puppet/locale/ru/fusiondirectory.po
+++ b/puppet/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/puppet/locale/ru@petr1708/fusiondirectory.po b/puppet/locale/ru@petr1708/fusiondirectory.po
index 52c3f15422..08e929b57d 100644
--- a/puppet/locale/ru@petr1708/fusiondirectory.po
+++ b/puppet/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/puppet/locale/sv/fusiondirectory.po b/puppet/locale/sv/fusiondirectory.po
index 14a31e9d93..9afcd469f7 100644
--- a/puppet/locale/sv/fusiondirectory.po
+++ b/puppet/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/puppet/locale/ug/fusiondirectory.po b/puppet/locale/ug/fusiondirectory.po
index f40bca7b63..f486a7c563 100644
--- a/puppet/locale/ug/fusiondirectory.po
+++ b/puppet/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/puppet/locale/vi_VN/fusiondirectory.po b/puppet/locale/vi_VN/fusiondirectory.po
index 886eb59de6..2860c910ba 100644
--- a/puppet/locale/vi_VN/fusiondirectory.po
+++ b/puppet/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/puppet/locale/zh/fusiondirectory.po b/puppet/locale/zh/fusiondirectory.po
index 33df9fe7c9..ac52746f12 100644
--- a/puppet/locale/zh/fusiondirectory.po
+++ b/puppet/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/pureftpd/locale/ar/fusiondirectory.po b/pureftpd/locale/ar/fusiondirectory.po
index 4a6929cc30..b7209cfd4f 100644
--- a/pureftpd/locale/ar/fusiondirectory.po
+++ b/pureftpd/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/pureftpd/locale/ca/fusiondirectory.po b/pureftpd/locale/ca/fusiondirectory.po
index d7c4e0a030..813b3e229f 100644
--- a/pureftpd/locale/ca/fusiondirectory.po
+++ b/pureftpd/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/pureftpd/locale/cs_CZ/fusiondirectory.po b/pureftpd/locale/cs_CZ/fusiondirectory.po
index 25c04b4a24..672e7a9dad 100644
--- a/pureftpd/locale/cs_CZ/fusiondirectory.po
+++ b/pureftpd/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/pureftpd/locale/de/fusiondirectory.po b/pureftpd/locale/de/fusiondirectory.po
index 4dab8d3dbc..8b7bc710f9 100644
--- a/pureftpd/locale/de/fusiondirectory.po
+++ b/pureftpd/locale/de/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/pureftpd/locale/el_GR/fusiondirectory.po b/pureftpd/locale/el_GR/fusiondirectory.po
index 496b167526..e68da82f62 100644
--- a/pureftpd/locale/el_GR/fusiondirectory.po
+++ b/pureftpd/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/pureftpd/locale/es/fusiondirectory.po b/pureftpd/locale/es/fusiondirectory.po
index 6c1b3c464c..6183d84183 100644
--- a/pureftpd/locale/es/fusiondirectory.po
+++ b/pureftpd/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/pureftpd/locale/es_CO/fusiondirectory.po b/pureftpd/locale/es_CO/fusiondirectory.po
index 7ad53d564d..2c8999d544 100644
--- a/pureftpd/locale/es_CO/fusiondirectory.po
+++ b/pureftpd/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/pureftpd/locale/es_VE/fusiondirectory.po b/pureftpd/locale/es_VE/fusiondirectory.po
index 0b5df9a899..b4501c6534 100644
--- a/pureftpd/locale/es_VE/fusiondirectory.po
+++ b/pureftpd/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/pureftpd/locale/fa_IR/fusiondirectory.po b/pureftpd/locale/fa_IR/fusiondirectory.po
index 2197874ed6..c0634640e4 100644
--- a/pureftpd/locale/fa_IR/fusiondirectory.po
+++ b/pureftpd/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/pureftpd/locale/fi_FI/fusiondirectory.po b/pureftpd/locale/fi_FI/fusiondirectory.po
index 6eb14d1861..32fbdf75e0 100644
--- a/pureftpd/locale/fi_FI/fusiondirectory.po
+++ b/pureftpd/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/pureftpd/locale/fr/fusiondirectory.po b/pureftpd/locale/fr/fusiondirectory.po
index f114e46674..a33cf512eb 100644
--- a/pureftpd/locale/fr/fusiondirectory.po
+++ b/pureftpd/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/pureftpd/locale/hu_HU/fusiondirectory.po b/pureftpd/locale/hu_HU/fusiondirectory.po
index 5e2f4f2613..c51870fad0 100644
--- a/pureftpd/locale/hu_HU/fusiondirectory.po
+++ b/pureftpd/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/pureftpd/locale/id/fusiondirectory.po b/pureftpd/locale/id/fusiondirectory.po
index 51560db1e1..a7cb2d62f0 100644
--- a/pureftpd/locale/id/fusiondirectory.po
+++ b/pureftpd/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/pureftpd/locale/it_IT/fusiondirectory.po b/pureftpd/locale/it_IT/fusiondirectory.po
index 906a2db6e1..9b2762d5d8 100644
--- a/pureftpd/locale/it_IT/fusiondirectory.po
+++ b/pureftpd/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:27+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/pureftpd/locale/lv/fusiondirectory.po b/pureftpd/locale/lv/fusiondirectory.po
index a35fb6772c..06518f7414 100644
--- a/pureftpd/locale/lv/fusiondirectory.po
+++ b/pureftpd/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/pureftpd/locale/nb/fusiondirectory.po b/pureftpd/locale/nb/fusiondirectory.po
index fb8673243e..f067f98793 100644
--- a/pureftpd/locale/nb/fusiondirectory.po
+++ b/pureftpd/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/pureftpd/locale/nl/fusiondirectory.po b/pureftpd/locale/nl/fusiondirectory.po
index ff32883788..3c46eccdd8 100644
--- a/pureftpd/locale/nl/fusiondirectory.po
+++ b/pureftpd/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/pureftpd/locale/pl/fusiondirectory.po b/pureftpd/locale/pl/fusiondirectory.po
index 0fd13e1130..7637ee503c 100644
--- a/pureftpd/locale/pl/fusiondirectory.po
+++ b/pureftpd/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/pureftpd/locale/pt/fusiondirectory.po b/pureftpd/locale/pt/fusiondirectory.po
index d46d27b4e4..021dc36867 100644
--- a/pureftpd/locale/pt/fusiondirectory.po
+++ b/pureftpd/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/pureftpd/locale/pt_BR/fusiondirectory.po b/pureftpd/locale/pt_BR/fusiondirectory.po
index d128b30b91..98d5e804e2 100644
--- a/pureftpd/locale/pt_BR/fusiondirectory.po
+++ b/pureftpd/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/pureftpd/locale/ru/fusiondirectory.po b/pureftpd/locale/ru/fusiondirectory.po
index 91a39189ef..84822d2fca 100644
--- a/pureftpd/locale/ru/fusiondirectory.po
+++ b/pureftpd/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-10 07:18+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/pureftpd/locale/ru@petr1708/fusiondirectory.po b/pureftpd/locale/ru@petr1708/fusiondirectory.po
index a981d8bf4c..554afe1681 100644
--- a/pureftpd/locale/ru@petr1708/fusiondirectory.po
+++ b/pureftpd/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/pureftpd/locale/sv/fusiondirectory.po b/pureftpd/locale/sv/fusiondirectory.po
index 8938cca717..1ef710aa35 100644
--- a/pureftpd/locale/sv/fusiondirectory.po
+++ b/pureftpd/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/pureftpd/locale/ug/fusiondirectory.po b/pureftpd/locale/ug/fusiondirectory.po
index 0b397466d8..51b1e65ad2 100644
--- a/pureftpd/locale/ug/fusiondirectory.po
+++ b/pureftpd/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/pureftpd/locale/vi_VN/fusiondirectory.po b/pureftpd/locale/vi_VN/fusiondirectory.po
index 2cb0d740f8..b3b2d8e0d9 100644
--- a/pureftpd/locale/vi_VN/fusiondirectory.po
+++ b/pureftpd/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/pureftpd/locale/zh/fusiondirectory.po b/pureftpd/locale/zh/fusiondirectory.po
index ddf088c919..cc45bfe23c 100644
--- a/pureftpd/locale/zh/fusiondirectory.po
+++ b/pureftpd/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/quota/locale/ar/fusiondirectory.po b/quota/locale/ar/fusiondirectory.po
index edc565205f..848096480a 100644
--- a/quota/locale/ar/fusiondirectory.po
+++ b/quota/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "خادم"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "خادم"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/ca/fusiondirectory.po b/quota/locale/ca/fusiondirectory.po
index e18f560fcf..e46097b447 100644
--- a/quota/locale/ca/fusiondirectory.po
+++ b/quota/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/cs_CZ/fusiondirectory.po b/quota/locale/cs_CZ/fusiondirectory.po
index df571209dc..e59c8e9606 100644
--- a/quota/locale/cs_CZ/fusiondirectory.po
+++ b/quota/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Kvóta"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr "Zásuvný modul pro kvóty"
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr "Informace o kvótách"
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr "Informace o kvótách pro tohoto uživatele"
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "Zařízení"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr "Zařízení, kterého se tato kvóta týká"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr "Hranice varování blížícího se vyčerpání kvóty počtu zabraných bloků"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr "Hranice varování blížícího se vyčerpání kvóty bloků, které uživatel může využít"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr "Nepřekročitelná hranice počtu zabraných bloků"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr "Nepřekročitelná hranice počtu bloků, které uživatel může využít"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr "varovný („měkký“) limit počtu souborů a složek (i-uzlů)"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr "Hranice varování blížícího se vyčerpání kvóty i-uzlů, které uživatel může využít"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr "nepřekročitelný („tvrdý“) limit počtu souborů a složek (i-uzlů)"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr "Nepřekročitelná hranice počtu i-uzlů, které uživatel může využít"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Server"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr "Server ve kterém se nachází zařízení, kterého se týká tato kvóta"
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr "Sdílení"
 msgid "Quotas for the shares this server hosts"
 msgstr "Kvóty pro sdílení na tomto serveru"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "Zařízení"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr "Zařízení, kterého se tato kvóta týká"
@@ -168,63 +228,3 @@ msgstr "Neplatná hodnota v kódování znaků : %s"
 #, php-format
 msgid "(%s by %s)"
 msgstr "(%s od %s)"
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Kvóta"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr "Zásuvný modul pro kvóty"
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr "Informace o kvótách"
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr "Informace o kvótách pro tohoto uživatele"
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr "Zařízení, kterého se tato kvóta týká"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr "Hranice varování blížícího se vyčerpání kvóty počtu zabraných bloků"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr "Hranice varování blížícího se vyčerpání kvóty bloků, které uživatel může využít"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr "Nepřekročitelná hranice počtu zabraných bloků"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr "Nepřekročitelná hranice počtu bloků, které uživatel může využít"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr "varovný („měkký“) limit počtu souborů a složek (i-uzlů)"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr "Hranice varování blížícího se vyčerpání kvóty i-uzlů, které uživatel může využít"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr "nepřekročitelný („tvrdý“) limit počtu souborů a složek (i-uzlů)"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr "Nepřekročitelná hranice počtu i-uzlů, které uživatel může využít"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Server"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr "Server ve kterém se nachází zařízení, kterého se týká tato kvóta"
diff --git a/quota/locale/de/fusiondirectory.po b/quota/locale/de/fusiondirectory.po
index 06a74efc79..e035bb7303 100644
--- a/quota/locale/de/fusiondirectory.po
+++ b/quota/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Kontingent"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr "Kontingentinformationen"
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr "Kontingentinformationen für diesen Benutzer"
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "Gerät"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr "Gerät für dieses Kontingent"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Server"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr "Server, der das Gerät für dieses Kontingent bereitstellt"
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr "Freigaben"
 msgid "Quotas for the shares this server hosts"
 msgstr "Kontingente für die Freigaben, die dieser Server bereitstellt"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "Gerät"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr "Gerät, die dieses Kontingent betrifft"
@@ -168,63 +228,3 @@ msgstr "Ungültiger Wert in Kodierungen : %s"
 #, php-format
 msgid "(%s by %s)"
 msgstr "(%s von %s)"
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Kontingent"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr "Kontingentinformationen"
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr "Kontingentinformationen für diesen Benutzer"
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr "Gerät für dieses Kontingent"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Server"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr "Server, der das Gerät für dieses Kontingent bereitstellt"
diff --git a/quota/locale/el_GR/fusiondirectory.po b/quota/locale/el_GR/fusiondirectory.po
index 70f60f1fa6..a579586157 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,71 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Όρια"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr "Πρόσθετο για την υποστήριξη ορίων"
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr "Πληροφορίες ορίων"
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr "Πληροφορίες ορίων αυτού του χρήστη"
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "Συσκευή"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr "Συσκευή που αφορά αυτά τα όρια"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr "Μερικό όριο πακέτου"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr "Το μερικό όριο του πακέτου που μπορεί να χρησιμοποιήσει ο χρήστης"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr "Καθολικό όριο πακέτου"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr "Το καθολικό όριο του πακέτου που μπορεί να χρησιμοποιήσει ο χρήστης"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr "Μερικό όριο κόμβου"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr "Το μερικό όριο κόμβου που μπορεί να χρησιμοποιήσει ο χρήστης"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr "Καθολικό όριο κόμβου"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr "Το καθολικό όριο κόμβου που μπορεί να χρησιμοποιήσει ο χρήστης"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Διακομιστής"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr "Ο διακομιστής που έχει τη συσκευή που αφορά αυτό το όριο"
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -35,11 +100,6 @@ msgstr "Κοινόχρηστοι πόροι"
 msgid "Quotas for the shares this server hosts"
 msgstr "Όρια κοινόχρηστων πόρων που παρέχει αυτός ο διακομιστής"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "Συσκευή"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr "Συσκευή που αφορά αυτό το όριο"
@@ -169,63 +229,3 @@ msgstr "Μη έγκυρη τιμή στις κωδικοποιήσεις: %s"
 #, php-format
 msgid "(%s by %s)"
 msgstr "(%s by %s)"
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Όρια"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr "Πρόσθετο για την υποστήριξη ορίων"
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr "Πληροφορίες ορίων"
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr "Πληροφορίες ορίων αυτού του χρήστη"
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr "Συσκευή που αφορά αυτά τα όρια"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr "Μερικό όριο πακέτου"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr "Το μερικό όριο του πακέτου που μπορεί να χρησιμοποιήσει ο χρήστης"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr "Καθολικό όριο πακέτου"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr "Το καθολικό όριο του πακέτου που μπορεί να χρησιμοποιήσει ο χρήστης"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr "Μερικό όριο κόμβου"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr "Το μερικό όριο κόμβου που μπορεί να χρησιμοποιήσει ο χρήστης"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr "Καθολικό όριο κόμβου"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr "Το καθολικό όριο κόμβου που μπορεί να χρησιμοποιήσει ο χρήστης"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Διακομιστής"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr "Ο διακομιστής που έχει τη συσκευή που αφορά αυτό το όριο"
diff --git a/quota/locale/es/fusiondirectory.po b/quota/locale/es/fusiondirectory.po
index e0783dc343..a996d2b97a 100644
--- a/quota/locale/es/fusiondirectory.po
+++ b/quota/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Cuota"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "Dispositivo"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr "Limite suave de bloques"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr "Limite duro de bloques"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr "Limite suave de inodos"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr "Limite duro de inodos"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Servidor"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr "Recursos compartidos"
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "Dispositivo"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Cuota"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr "Limite suave de bloques"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr "Limite duro de bloques"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr "Limite suave de inodos"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr "Limite duro de inodos"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Servidor"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/es_CO/fusiondirectory.po b/quota/locale/es_CO/fusiondirectory.po
index c8b79982ea..7388aed489 100644
--- a/quota/locale/es_CO/fusiondirectory.po
+++ b/quota/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/es_VE/fusiondirectory.po b/quota/locale/es_VE/fusiondirectory.po
index 0cdfb3190d..2cf40803eb 100644
--- a/quota/locale/es_VE/fusiondirectory.po
+++ b/quota/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Cuota"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "Dispositivo"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr "Limite suave de bloques"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr "Limite duro de bloques"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr "Limite suave de inodos"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr "Limite duro de inodos"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Servidor"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr "Recursos compartidos"
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "Dispositivo"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Cuota"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr "Limite suave de bloques"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr "Limite duro de bloques"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr "Limite suave de inodos"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr "Limite duro de inodos"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Servidor"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/fa_IR/fusiondirectory.po b/quota/locale/fa_IR/fusiondirectory.po
index 2855d98d9c..fff900778b 100644
--- a/quota/locale/fa_IR/fusiondirectory.po
+++ b/quota/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/fi_FI/fusiondirectory.po b/quota/locale/fi_FI/fusiondirectory.po
index 9f18b61213..047354d757 100644
--- a/quota/locale/fi_FI/fusiondirectory.po
+++ b/quota/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/fr/fusiondirectory.po b/quota/locale/fr/fusiondirectory.po
index f69beda8eb..c3e039b254 100644
--- a/quota/locale/fr/fusiondirectory.po
+++ b/quota/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -19,6 +19,71 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Quota"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr "Gestion des quotas utilisateurs"
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr "Informations sur les quotas"
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr "Informations sur les quotas de l'utilisateur"
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "Périphérique"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr "Périphérique pour lequel le quota s'applique"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr "Taille limite"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr "Nombre maximal de blocs utilisables par l'utilisateur avant avertissement"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr "Taille critique"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr "Nombre maximal de blocs utilisables par l'utilisateur avant blocage"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr "Nombre limite de fichiers"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr "Nombre maximal d'inode utilisables par l'utilisateur avant avertissement"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr "Nombre critique de fichiers"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr "Nombre maximal d'inode utilisables par l'utilisateur avant blocage"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Serveur"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr "Serveur hébergeant le périphérique sur lequel s'applique le quota"
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -36,11 +101,6 @@ msgstr "Partages"
 msgid "Quotas for the shares this server hosts"
 msgstr "Quota pour les partages fournis par ce serveur"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "Périphérique"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr "Périphérique concerné par ce quota"
@@ -170,63 +230,3 @@ msgstr "Valeur d'encodage invalide : %s"
 #, php-format
 msgid "(%s by %s)"
 msgstr "(%s par %s)"
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Quota"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr "Gestion des quotas utilisateurs"
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr "Informations sur les quotas"
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr "Informations sur les quotas de l'utilisateur"
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr "Périphérique pour lequel le quota s'applique"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr "Taille limite"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr "Nombre maximal de blocs utilisables par l'utilisateur avant avertissement"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr "Taille critique"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr "Nombre maximal de blocs utilisables par l'utilisateur avant blocage"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr "Nombre limite de fichiers"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr "Nombre maximal d'inode utilisables par l'utilisateur avant avertissement"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr "Nombre critique de fichiers"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr "Nombre maximal d'inode utilisables par l'utilisateur avant blocage"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Serveur"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr "Serveur hébergeant le périphérique sur lequel s'applique le quota"
diff --git a/quota/locale/hu_HU/fusiondirectory.po b/quota/locale/hu_HU/fusiondirectory.po
index d5efb46f17..06f630fb0e 100644
--- a/quota/locale/hu_HU/fusiondirectory.po
+++ b/quota/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/id/fusiondirectory.po b/quota/locale/id/fusiondirectory.po
index 630c0c0783..ecede9c9e1 100644
--- a/quota/locale/id/fusiondirectory.po
+++ b/quota/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/it_IT/fusiondirectory.po b/quota/locale/it_IT/fusiondirectory.po
index ce767c0d69..97c755425e 100644
--- a/quota/locale/it_IT/fusiondirectory.po
+++ b/quota/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:27+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,6 +19,71 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Quota"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr "Plugin per l'uso di Quota"
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr "Informazioni sulla quota"
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr "Informazioni sulla quota di questo utente"
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "Dispositivi"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr "Dispositivo interessato da questa quota"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr "Dimensione limite del blocco"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr "Limite soft per il blocco che l'utente può utilizzare"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr "Dimensione critica del blocco"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr "Limite hard per il blocco che l'utente può utilizzare"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr "Numero limite di files"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr "Limite soft per il gli inodes che l'utente può utilizzare"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr "Numero critico di files"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr "Limite hard per gli inodes che l'utente può utilizzare"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Server"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr "Server che ospita il dispositivo interessato da questa quota"
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -36,11 +101,6 @@ msgstr "Condivisioni"
 msgid "Quotas for the shares this server hosts"
 msgstr "Quote delle condivisioni ospitate su questo server"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "Dispositivi"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr "Dispositivo interessato da questa quota"
@@ -170,63 +230,3 @@ msgstr "Valore non valido in codifiche : %s"
 #, php-format
 msgid "(%s by %s)"
 msgstr "(%s di %s)"
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Quota"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr "Plugin per l'uso di Quota"
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr "Informazioni sulla quota"
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr "Informazioni sulla quota di questo utente"
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr "Dispositivo interessato da questa quota"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr "Dimensione limite del blocco"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr "Limite soft per il blocco che l'utente può utilizzare"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr "Dimensione critica del blocco"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr "Limite hard per il blocco che l'utente può utilizzare"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr "Numero limite di files"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr "Limite soft per il gli inodes che l'utente può utilizzare"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr "Numero critico di files"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr "Limite hard per gli inodes che l'utente può utilizzare"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Server"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr "Server che ospita il dispositivo interessato da questa quota"
diff --git a/quota/locale/lv/fusiondirectory.po b/quota/locale/lv/fusiondirectory.po
index 771a51ebcf..3b1813c2ff 100644
--- a/quota/locale/lv/fusiondirectory.po
+++ b/quota/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/nb/fusiondirectory.po b/quota/locale/nb/fusiondirectory.po
index 0a9527d888..50aa38505a 100644
--- a/quota/locale/nb/fusiondirectory.po
+++ b/quota/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Tjener"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Tjener"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/nl/fusiondirectory.po b/quota/locale/nl/fusiondirectory.po
index 918e6d0023..dccbf1d4f6 100644
--- a/quota/locale/nl/fusiondirectory.po
+++ b/quota/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Quota"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr "Plugin voor quota support"
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "Apparaat"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr "Block soft limit"
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr "Block hard limit"
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr "Inode soft limit"
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr "Inode hard limit"
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Server"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr "Shares"
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "Apparaat"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Quota"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr "Plugin voor quota support"
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr "Block soft limit"
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr "Block hard limit"
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr "Inode soft limit"
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr "Inode hard limit"
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Server"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/pl/fusiondirectory.po b/quota/locale/pl/fusiondirectory.po
index ea6545064f..177d682eee 100644
--- a/quota/locale/pl/fusiondirectory.po
+++ b/quota/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Quota"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "UrzÄ…dzenie"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Serwer"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr "Udziały"
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "UrzÄ…dzenie"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Quota"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Serwer"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/pt/fusiondirectory.po b/quota/locale/pt/fusiondirectory.po
index 54f7369d86..d5aad31243 100644
--- a/quota/locale/pt/fusiondirectory.po
+++ b/quota/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Servidor"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Servidor"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/pt_BR/fusiondirectory.po b/quota/locale/pt_BR/fusiondirectory.po
index 97176e3a60..e11df72a9a 100644
--- a/quota/locale/pt_BR/fusiondirectory.po
+++ b/quota/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Cota"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "Dispositivo"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "servidor"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "Dispositivo"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Cota"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "servidor"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/ru/fusiondirectory.po b/quota/locale/ru/fusiondirectory.po
index aeb8f98df3..de39686ca3 100644
--- a/quota/locale/ru/fusiondirectory.po
+++ b/quota/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-08 19:21+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Квота"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Сервер"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr "Шары"
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Квота"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Сервер"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/ru@petr1708/fusiondirectory.po b/quota/locale/ru@petr1708/fusiondirectory.po
index b1602a576a..f333eeba1d 100644
--- a/quota/locale/ru@petr1708/fusiondirectory.po
+++ b/quota/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/sv/fusiondirectory.po b/quota/locale/sv/fusiondirectory.po
index 0903c6aaca..b3d59875ee 100644
--- a/quota/locale/sv/fusiondirectory.po
+++ b/quota/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "Enhet"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Server"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "Enhet"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Server"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/ug/fusiondirectory.po b/quota/locale/ug/fusiondirectory.po
index 3a4971b2ed..994c8c0ed1 100644
--- a/quota/locale/ug/fusiondirectory.po
+++ b/quota/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:56+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/vi_VN/fusiondirectory.po b/quota/locale/vi_VN/fusiondirectory.po
index abd9185a6d..2900988be0 100644
--- a/quota/locale/vi_VN/fusiondirectory.po
+++ b/quota/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "Máy chủ (server)"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr ""
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr ""
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "Máy chủ (server)"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/quota/locale/zh/fusiondirectory.po b/quota/locale/zh/fusiondirectory.po
index 0d63287864..cdd449004a 100644
--- a/quota/locale/zh/fusiondirectory.po
+++ b/quota/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,71 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr "Quota"
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota informations"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota informations for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+#: admin/systems/services/quota/class_serviceQuota.inc:51
+msgid "Device"
+msgstr "设备"
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:139
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:145
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server"
+msgstr "服务器"
+
+#: personal/quota/class_quotaAccount.inc:157
+msgid "Server hosting the device this quota is for"
+msgstr ""
+
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
@@ -34,11 +99,6 @@ msgstr "共享"
 msgid "Quotas for the shares this server hosts"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:51
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device"
-msgstr "设备"
-
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
 msgstr ""
@@ -168,63 +228,3 @@ msgstr ""
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:101
-msgid "Quota"
-msgstr "Quota"
-
-#: personal/quota/class_quotaAccount.inc:102
-msgid "Plugin for quota support"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:120
-msgid "Quota informations"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:125
-msgid "Quota informations for this user"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:129
-msgid "Device this quota is for"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Block soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:133
-msgid "Soft limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Block hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:139
-msgid "Hard limit for the block the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Inode soft limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:145
-msgid "Soft limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Inode hard limit"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:151
-msgid "Hard limit for the inodes the user can use"
-msgstr ""
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server"
-msgstr "服务器"
-
-#: personal/quota/class_quotaAccount.inc:157
-msgid "Server hosting the device this quota is for"
-msgstr ""
diff --git a/repository/locale/ar/fusiondirectory.po b/repository/locale/ar/fusiondirectory.po
index 9b9c617b81..d6ca8aee2c 100644
--- a/repository/locale/ar/fusiondirectory.po
+++ b/repository/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,77 +17,33 @@ 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/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "الإسم"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "الوصف"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "الإسم"
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr "الوصف"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/ca/fusiondirectory.po b/repository/locale/ca/fusiondirectory.po
index 8f9b8e3f53..3a23f3d1fa 100644
--- a/repository/locale/ca/fusiondirectory.po
+++ b/repository/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Nom"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Nom"
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/cs_CZ/fusiondirectory.po b/repository/locale/cs_CZ/fusiondirectory.po
index cd7e2bf7a0..53e24560ae 100644
--- a/repository/locale/cs_CZ/fusiondirectory.po
+++ b/repository/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,78 +17,34 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr "Distribuce repozitáře"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Název"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr "Jedinečný název pro tuto distribuci"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Popis"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr "Popis této distribuce"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Sekce"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr "Sekce, které tato distribuce obsahuje"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr "Vychází z"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
-msgstr "Distribuce, na kterých je tato založena"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
+msgstr "Nastavení repozitáře"
 
-#: 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 "Sekce repozitáře"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
+msgstr "Nastavení zásuvného modulu repozitář pro FusionDirectory"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
-msgstr "Jedinečný název pro tuto sekci"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Repozitář"
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
-msgstr "Popis této sekce"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
+msgstr "Relativní rozlišený název repozitáře"
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
-msgstr "Sekce, na kterých je tato založena"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
+msgstr "Větev, ve které budou uloženy objekty repozitáře"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
-msgstr "Správa repozitáře"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
+msgstr "Typy repozitářů"
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Repozitář"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
+msgstr "Dostupné typy repozitářů"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
@@ -97,10 +53,22 @@ msgstr "Repozitář"
 msgid "Build repository"
 msgstr "Vytvořit repozitář"
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Název"
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr "Jedinečný název pro tento repozitář"
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr "Popis"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr "Popis tohoto repozitáře"
@@ -157,26 +125,58 @@ msgstr "Uživatelé"
 msgid "Users of this repository"
 msgstr "Uživatelé tohoto repozitáře"
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
-msgstr "Nastavení repozitáře"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
+msgstr "Správa repozitáře"
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
-msgstr "Nastavení zásuvného modulu repozitář pro FusionDirectory"
+#: 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 "Distribuce repozitáře"
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
-msgstr "Relativní rozlišený název repozitáře"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
+msgstr "Jedinečný název pro tuto distribuci"
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
-msgstr "Větev, ve které budou uloženy objekty repozitáře"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
+msgstr "Popis této distribuce"
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
-msgstr "Typy repozitářů"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Sekce"
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
-msgstr "Dostupné typy repozitářů"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr "Sekce, které tato distribuce obsahuje"
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr "Vychází z"
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr "Distribuce, na kterých je tato založena"
+
+#: 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 "Sekce repozitáře"
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr "Jedinečný název pro tuto sekci"
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr "Popis této sekce"
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
+msgstr "Sekce, na kterých je tato založena"
diff --git a/repository/locale/de/fusiondirectory.po b/repository/locale/de/fusiondirectory.po
index 89cc6bcf84..78c6115daf 100644
--- a/repository/locale/de/fusiondirectory.po
+++ b/repository/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,78 +17,34 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr "Repositoriumsverteilung"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Name"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr "Eindeutiger Name für diese Distribution"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Beschreibung"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr "Beschreibung dieser Distribution"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Section"
-
-#: 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 "Basiert auf"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
-msgstr ""
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
+msgstr "Repositoriumskonfiguration"
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
-msgstr ""
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Repository"
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
-msgstr "Repositoriumsverwaltung"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
+msgstr "Repositoriumstypen"
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
+msgstr "Verfügbare Repositorientypen"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
@@ -97,10 +53,22 @@ msgstr "Repository"
 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 "Name"
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr "Eindeutiger Name für dieses Repositorium"
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr "Beschreibung"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr "Beschreibung von diesem Repositorium"
@@ -157,26 +125,58 @@ msgstr "Benutzer"
 msgid "Users of this repository"
 msgstr "Benutzer dieses Repositoriums"
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
-msgstr "Repositoriumskonfiguration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
+msgstr "Repositoriumsverwaltung"
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
+msgstr "Repositoriumsverteilung"
+
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
+msgstr "Eindeutiger Name für diese Distribution"
+
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
+msgstr "Beschreibung dieser Distribution"
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Section"
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr "Basiert auf"
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: 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 ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
-msgstr "Repositoriumstypen"
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
-msgstr "Verfügbare Repositorientypen"
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
+msgstr ""
diff --git a/repository/locale/el_GR/fusiondirectory.po b/repository/locale/el_GR/fusiondirectory.po
index 598eabdce6..b393b50a52 100644
--- a/repository/locale/el_GR/fusiondirectory.po
+++ b/repository/locale/el_GR/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -20,78 +20,34 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr "Διανομή αποθετηρίου"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Όνομα"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr "Ένα μοναδικό όνομα για αυτήν τη διανομή"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Περιγραφή"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr "Περιγραφή της διανομής"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Ενότητα"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr "Οι ενότητες που περιλαμβάνει αυτή η διανομή"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr "Βασισμένο σε"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
-msgstr "Οι διανομές στις οποιες βασίζεται"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
+msgstr "Ρύθμιση του αποθετηρίου"
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
-msgstr "Ενότητα αποθετηρίου"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
+msgstr "Ρύθμιση προσθέτου του αποθετηρίου FusionDirectory"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
-msgstr "Ένα μοναδικό όνομα για αυτή την ενότητα"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Αποθετήριο"
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
-msgstr "Περιγραφή αυτής της ενότητας"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
+msgstr "RDN αποθετηρίου"
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
-msgstr "Οι ενότητες στις οποίες βασίζεται"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
+msgstr "Κλάδος στον οποίο θα αποθηκεύονται τα αντικείμενα του αποθετηρίου"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
-msgstr "Διαχείριση αποθετηρίου"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
+msgstr "Τύποι αποθετηρίου"
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Αποθετήριο"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
+msgstr "Διαθέσιμοι τύποι αποθετηρίου"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
@@ -100,10 +56,22 @@ msgstr "Αποθετήριο"
 msgid "Build repository"
 msgstr "Αποθετήριο έκδοσης"
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Όνομα"
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr "Μοναδικό όνομα για το αποθετήριο."
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr "Περιγραφή"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr "Περιγραφή αυτο του αποθετηρίου"
@@ -160,26 +128,58 @@ msgstr "Χρήστες"
 msgid "Users of this repository"
 msgstr "Χρήστες του αποθετηρίου"
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
-msgstr "Ρύθμιση του αποθετηρίου"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
+msgstr "Διαχείριση αποθετηρίου"
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
-msgstr "Ρύθμιση προσθέτου του αποθετηρίου FusionDirectory"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
+msgstr "Διανομή αποθετηρίου"
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
-msgstr "RDN αποθετηρίου"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
+msgstr "Ένα μοναδικό όνομα για αυτήν τη διανομή"
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
-msgstr "Κλάδος στον οποίο θα αποθηκεύονται τα αντικείμενα του αποθετηρίου"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
+msgstr "Περιγραφή της διανομής"
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
-msgstr "Τύποι αποθετηρίου"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Ενότητα"
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
-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 "Οι ενότητες στις οποίες βασίζεται"
diff --git a/repository/locale/es/fusiondirectory.po b/repository/locale/es/fusiondirectory.po
index 916ceef78c..f520daee60 100644
--- a/repository/locale/es/fusiondirectory.po
+++ b/repository/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,79 +17,35 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Sección"
-
-#: 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"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
-msgstr ""
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Repositorio"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Repositorio"
-
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
 #: admin/repository/class_buildRepository.inc:33
@@ -97,10 +53,22 @@ msgstr "Repositorio"
 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 "Nombre"
+
 #: 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 "Descripción"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Usuarios"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Sección"
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/es_CO/fusiondirectory.po b/repository/locale/es_CO/fusiondirectory.po
index 6bd26ea820..2446c65cdc 100644
--- a/repository/locale/es_CO/fusiondirectory.po
+++ b/repository/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Nombre"
+
 #: 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 "Descripción"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Usuarios"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/es_VE/fusiondirectory.po b/repository/locale/es_VE/fusiondirectory.po
index e2df3b2508..90e3036f85 100644
--- a/repository/locale/es_VE/fusiondirectory.po
+++ b/repository/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,79 +17,35 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Sección"
-
-#: 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"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
-msgstr ""
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Repositorio"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Repositorio"
-
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
 #: admin/repository/class_buildRepository.inc:33
@@ -97,10 +53,22 @@ msgstr "Repositorio"
 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 "Nombre"
+
 #: 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 "Descripción"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Usuarios"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Sección"
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/fa_IR/fusiondirectory.po b/repository/locale/fa_IR/fusiondirectory.po
index f7a8841cc3..a7ecb2d1ef 100644
--- a/repository/locale/fa_IR/fusiondirectory.po
+++ b/repository/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/fi_FI/fusiondirectory.po b/repository/locale/fi_FI/fusiondirectory.po
index ff8472c1c1..e84d4ac5e7 100644
--- a/repository/locale/fi_FI/fusiondirectory.po
+++ b/repository/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:58+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Nimi"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Kuvaus"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Nimi"
+
 #: 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 "Kuvaus"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/fr/fusiondirectory.po b/repository/locale/fr/fusiondirectory.po
index 7945755e57..4de006f74c 100644
--- a/repository/locale/fr/fusiondirectory.po
+++ b/repository/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,78 +18,34 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr "Distribution du dépôt"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Nom"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr "Nom unique pour cette distribution"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Description"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr "Description de cette distribution"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Section"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr "Les sections que cette distribution contient"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr "Basé sur"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
-msgstr "Les distributions sur lesquelles celle ci est basée"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
+msgstr "Configuration de repository"
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
-msgstr "Section du dépôt"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
+msgstr "Configuration du plugin repository"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
-msgstr "Nom unique pour cette section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Dépôt"
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
-msgstr "Description de cette section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
+msgstr "Branche des dépôts"
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
-msgstr "Les sections sur lesquelles celle-ci est basée"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
+msgstr "Branche où seront stockés les objets dépôts"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
-msgstr "Gestion des dépôts"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
+msgstr "Types de dépôt"
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Dépôt"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
+msgstr "Type de dépôts disponibles"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
@@ -98,10 +54,22 @@ msgstr "Dépôt"
 msgid "Build repository"
 msgstr "Dépôt de construction"
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Nom"
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr "Nom unique pour ce dépôt"
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr "Description"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr "Description de ce dépôt"
@@ -158,26 +126,58 @@ msgstr "Utilisateurs"
 msgid "Users of this repository"
 msgstr "Utilisateurs de ce dépôt"
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
-msgstr "Configuration de repository"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
+msgstr "Gestion des dépôts"
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
-msgstr "Configuration du plugin repository"
+#: 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 "Distribution du dépôt"
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
-msgstr "Branche des dépôts"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
+msgstr "Nom unique pour cette distribution"
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
-msgstr "Branche où seront stockés les objets dépôts"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
+msgstr "Description de cette distribution"
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
-msgstr "Types de dépôt"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Section"
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
-msgstr "Type de dépôts disponibles"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr "Les sections que cette distribution contient"
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr "Basé sur"
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr "Les distributions sur lesquelles celle ci est basée"
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr "Section du dépôt"
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr "Nom unique pour cette section"
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr "Description de cette section"
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
+msgstr "Les sections sur lesquelles celle-ci est basée"
diff --git a/repository/locale/hu_HU/fusiondirectory.po b/repository/locale/hu_HU/fusiondirectory.po
index ea362cd982..95f41b75fa 100644
--- a/repository/locale/hu_HU/fusiondirectory.po
+++ b/repository/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:58+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Név"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Leírás"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Név"
+
 #: 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 "Leírás"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Felhasználók"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/id/fusiondirectory.po b/repository/locale/id/fusiondirectory.po
index c132bbf3fb..ff47868e60 100644
--- a/repository/locale/id/fusiondirectory.po
+++ b/repository/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:58+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/it_IT/fusiondirectory.po b/repository/locale/it_IT/fusiondirectory.po
index 9706cc263c..2bed70fd65 100644
--- a/repository/locale/it_IT/fusiondirectory.po
+++ b/repository/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:27+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,78 +19,34 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr "Distribuzione del repository"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Nome"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr "Nome unico per questa distribuzione"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Descrizione"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr "Descrizione di questa distribuzione"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Sezione"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr "Le sezioni incluse in questa distribuzione"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr "Basata su"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
-msgstr "Le distribuzioni sulle quali questo repository si basa"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
+msgstr "Configurazione del Repository"
 
-#: 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 "Sezione del repository"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
+msgstr "Configurazione del plugin Repository di FusionDirectory"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
-msgstr "Nome unico per questa sezione"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Deposito"
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
-msgstr "Descrizione di questa sezione"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
+msgstr "RDN Repository"
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
-msgstr "Le sezioni sulle quali questo repository si basa"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
+msgstr "Ramo nel quale gli oggetti Repository saranno immagazzinati"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
-msgstr "Gestione di Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
+msgstr "Tipi di repository"
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Deposito"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
+msgstr "Tipi di repository disponibili"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
@@ -99,10 +55,22 @@ msgstr "Deposito"
 msgid "Build repository"
 msgstr "Costruisci il Repository"
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Nome"
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr "Nome unico per questo Repository"
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr "Descrizione"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr "Descrizione del repository"
@@ -159,26 +127,58 @@ msgstr "Utenti"
 msgid "Users of this repository"
 msgstr "Utenti di questo repository"
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
-msgstr "Configurazione del Repository"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
+msgstr "Gestione di Repository"
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
-msgstr "Configurazione del plugin Repository di FusionDirectory"
+#: 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 "Distribuzione del repository"
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
-msgstr "RDN Repository"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
+msgstr "Nome unico per questa distribuzione"
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
-msgstr "Ramo nel quale gli oggetti Repository saranno immagazzinati"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
+msgstr "Descrizione di questa distribuzione"
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
-msgstr "Tipi di repository"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Sezione"
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
-msgstr "Tipi di repository disponibili"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr "Le sezioni incluse in questa distribuzione"
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr "Basata su"
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr "Le distribuzioni sulle quali questo repository si basa"
+
+#: 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 "Sezione del repository"
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr "Nome unico per questa sezione"
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr "Descrizione di questa sezione"
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
+msgstr "Le sezioni sulle quali questo repository si basa"
diff --git a/repository/locale/lv/fusiondirectory.po b/repository/locale/lv/fusiondirectory.po
index b0336f6f61..57813c3845 100644
--- a/repository/locale/lv/fusiondirectory.po
+++ b/repository/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,78 +17,34 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Vārds "
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr "Šīs sadales unikālais nosaukums"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Apraksts"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr "Šīs sadales apraksts"
-
-#: 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 ""
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
+msgstr "Krātuves iestatījumi"
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
-msgstr ""
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Krātuve "
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
-msgstr ""
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
+msgstr "Krātuvju tipi"
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Krātuve "
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
+msgstr "Pieejamie krātvuju veidi"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
@@ -97,10 +53,22 @@ msgstr "Krātuve "
 msgid "Build repository"
 msgstr "Iebūvētā krātuve"
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Vārds "
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr "Šīs krātuves unikālais nosaukums"
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr "Apraksts"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Lietotāji"
 msgid "Users of this repository"
 msgstr "Šīs krātuves lietotāji"
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
-msgstr "Krātuves iestatījumi"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
+msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
+msgstr "Šīs sadales unikālais nosaukums"
+
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
+msgstr "Šīs sadales apraksts"
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
-msgstr "Krātuvju tipi"
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
-msgstr "Pieejamie krātvuju veidi"
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
+msgstr ""
diff --git a/repository/locale/nb/fusiondirectory.po b/repository/locale/nb/fusiondirectory.po
index a3f54b50eb..3326f22e82 100644
--- a/repository/locale/nb/fusiondirectory.po
+++ b/repository/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Navn"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Navn"
+
 #: 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 "Beskrivelse"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/nl/fusiondirectory.po b/repository/locale/nl/fusiondirectory.po
index 0fab473a68..e97fd8a4c0 100644
--- a/repository/locale/nl/fusiondirectory.po
+++ b/repository/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,79 +17,35 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Naam"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Omschrijving"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Sectie"
-
-#: 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"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
-msgstr ""
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Verzamelplaats"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Verzamelplaats"
-
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
 #: admin/repository/class_buildRepository.inc:33
@@ -97,10 +53,22 @@ msgstr "Verzamelplaats"
 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 "Naam"
+
 #: 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 "Omschrijving"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Gebruikers"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Sectie"
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/pl/fusiondirectory.po b/repository/locale/pl/fusiondirectory.po
index c357450e91..9c36076502 100644
--- a/repository/locale/pl/fusiondirectory.po
+++ b/repository/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,79 +17,35 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Opis"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Sekcja"
-
-#: 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"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
-msgstr ""
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Repozytorium"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Repozytorium"
-
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
 #: admin/repository/class_buildRepository.inc:33
@@ -97,10 +53,22 @@ msgstr "Repozytorium"
 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 "ImiÄ™"
+
 #: 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 "Opis"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Użytkownicy"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Sekcja"
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/pt/fusiondirectory.po b/repository/locale/pt/fusiondirectory.po
index f1fe76d685..26df019041 100644
--- a/repository/locale/pt/fusiondirectory.po
+++ b/repository/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Nome"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Descrição"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Nome"
+
 #: 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 "Descrição"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Usuários"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/pt_BR/fusiondirectory.po b/repository/locale/pt_BR/fusiondirectory.po
index 00ffee2dc3..e1f07db57b 100644
--- a/repository/locale/pt_BR/fusiondirectory.po
+++ b/repository/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,78 +17,34 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr "Distribuição do repositório"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Nome"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr "Nome único para esta distribuição"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Descrição"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr "Descrição desta distribuição"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Seção"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr "A seção desta distribuição contém"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr "Baseado em"
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
-msgstr "Distribuição a qual este é baseado"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
+msgstr "Configuração de repositório"
 
-#: 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 "Seção do repositório"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
+msgstr "Configuração do plugin de repositório do FusionDirectory"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
-msgstr "Nome único para esta seção"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Repositório"
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
-msgstr "Descrição desta seção"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
+msgstr "Repositório RDN"
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
-msgstr "A seção a qual este é baseado"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
+msgstr "Ramo que armazenará objetos de repositório"
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
-msgstr "Gerenciamento de repositório"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
+msgstr "Tipo de repositório"
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Repositório"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
+msgstr "Tipo de repositórios disponíveis"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
@@ -97,10 +53,22 @@ msgstr "Repositório"
 msgid "Build repository"
 msgstr "Construir repositório"
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Nome"
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr "Nome único para este repositório"
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr "Descrição"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Usuários"
 msgid "Users of this repository"
 msgstr "Usuários deste repositório"
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
-msgstr "Configuração de repositório"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
+msgstr "Gerenciamento de repositório"
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
-msgstr "Configuração do plugin de repositório do FusionDirectory"
+#: 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 "Distribuição do repositório"
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
-msgstr "Repositório RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
+msgstr "Nome único para esta distribuição"
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
-msgstr "Ramo que armazenará objetos de repositório"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
+msgstr "Descrição desta distribuição"
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
-msgstr "Tipo de repositório"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Seção"
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
-msgstr "Tipo de repositórios disponíveis"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr "A seção desta distribuição contém"
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr "Baseado em"
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr "Distribuição a qual este é baseado"
+
+#: 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 "Seção do repositório"
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr "Nome único para esta seção"
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr "Descrição desta seção"
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
+msgstr "A seção a qual este é baseado"
diff --git a/repository/locale/ru/fusiondirectory.po b/repository/locale/ru/fusiondirectory.po
index 3703f5ecd6..e1ad7a6dba 100644
--- a/repository/locale/ru/fusiondirectory.po
+++ b/repository/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,77 +17,33 @@ 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/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Фамилия"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Описание"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Секция"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Фамилия"
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr "Описание"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Пользователи"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Секция"
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/ru@petr1708/fusiondirectory.po b/repository/locale/ru@petr1708/fusiondirectory.po
index f23e31aa3e..1e9d32d570 100644
--- a/repository/locale/ru@petr1708/fusiondirectory.po
+++ b/repository/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:58+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,77 +17,33 @@ 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/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/sv/fusiondirectory.po b/repository/locale/sv/fusiondirectory.po
index 10c9bb350f..ac709f61e3 100644
--- a/repository/locale/sv/fusiondirectory.po
+++ b/repository/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,79 +17,35 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Namn"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Beskrivning"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "Sektion"
-
-#: 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"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
-msgstr ""
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "Förråd"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
-msgstr "Förråd"
-
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
 #: admin/repository/class_buildRepository.inc:33
@@ -97,10 +53,22 @@ msgstr "Förråd"
 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 "Namn"
+
 #: 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 "Beskrivning"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Användare"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "Sektion"
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/ug/fusiondirectory.po b/repository/locale/ug/fusiondirectory.po
index 8d56d05e68..f4d7305a46 100644
--- a/repository/locale/ug/fusiondirectory.po
+++ b/repository/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 15:58+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr ""
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/vi_VN/fusiondirectory.po b/repository/locale/vi_VN/fusiondirectory.po
index b6769305e5..75ecacfec9 100644
--- a/repository/locale/vi_VN/fusiondirectory.po
+++ b/repository/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,77 +17,33 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "Tên"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "Mô tả"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: config/repository/class_repositoryConfig.inc:42
-msgid "Repository"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
 #: admin/repository/class_buildRepository.inc:30
@@ -97,10 +53,22 @@ msgstr ""
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "Tên"
+
 #: 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 "Mô tả"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "Người dùng"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/repository/locale/zh/fusiondirectory.po b/repository/locale/zh/fusiondirectory.po
index 654e9fad68..f629c7a064 100644
--- a/repository/locale/zh/fusiondirectory.po
+++ b/repository/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,79 +17,35 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/repository/class_repositoryDistribution.inc:30
-#: admin/repository/class_repositoryDistribution.inc:31
-#: admin/repository/class_repositoryDistribution.inc:33
-#: admin/repository/class_repositoryDistribution.inc:56
-msgid "Repository distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:60
-#: admin/repository/class_repositorySection.inc:57
-#: admin/repository/class_buildRepository.inc:63
-msgid "Name"
-msgstr "名称"
-
-#: admin/repository/class_repositoryDistribution.inc:60
-msgid "Unique name for this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:64
-#: admin/repository/class_repositorySection.inc:61
-#: admin/repository/class_buildRepository.inc:67
-msgid "Description"
-msgstr "描述"
-
-#: admin/repository/class_repositoryDistribution.inc:64
-msgid "Description of this distribution"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "Section"
-msgstr "节"
-
-#: admin/repository/class_repositoryDistribution.inc:69
-msgid "The sections this distribution contains"
-msgstr ""
-
-#: admin/repository/class_repositoryDistribution.inc:76
-#: admin/repository/class_repositorySection.inc:66
-msgid "Based on"
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
 msgstr ""
 
-#: admin/repository/class_repositoryDistribution.inc:76
-msgid "The distributions this one is based on"
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:30
-#: admin/repository/class_repositorySection.inc:31
-#: admin/repository/class_repositorySection.inc:33
-#: admin/repository/class_repositorySection.inc:53
-msgid "Repository section"
-msgstr ""
+#: config/repository/class_repositoryConfig.inc:42
+#: admin/repository/class_repositoryManagement.inc:40
+msgid "Repository"
+msgstr "仓库"
 
-#: admin/repository/class_repositorySection.inc:57
-msgid "Unique name for this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:61
-msgid "Description of this section"
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
 msgstr ""
 
-#: admin/repository/class_repositorySection.inc:66
-msgid "The sections this one is based on"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:34
-#: admin/repository/class_repositoryManagement.inc:35
-msgid "Repository management"
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:40
-#: 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
@@ -97,10 +53,22 @@ msgstr "仓库"
 msgid "Build repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr "名称"
+
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
 msgstr ""
 
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr "描述"
+
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
 msgstr ""
@@ -157,26 +125,58 @@ msgstr "用户"
 msgid "Users of this repository"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:28
-msgid "Repository configuration"
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:29
-msgid "FusionDirectory repository plugin configuration"
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Repository RDN"
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:45
-msgid "Branch in which repository objects will be stored"
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Repository types"
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr "节"
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
 msgstr ""
 
-#: config/repository/class_repositoryConfig.inc:51
-msgid "Available repository types"
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
 msgstr ""
diff --git a/samba/locale/ar/fusiondirectory.po b/samba/locale/ar/fusiondirectory.po
index f9b91750e9..b55cdc5972 100644
--- a/samba/locale/ar/fusiondirectory.po
+++ b/samba/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,641 +17,641 @@ 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/groups/samba/class_sambaGroup.inc:29
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
 msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "تحذير"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "الخواص"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "الإسم"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "الوصف"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 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:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "تحذير"
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
-msgstr ""
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "الخواص"
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "الإسم"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "الوصف"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/ca/fusiondirectory.po b/samba/locale/ca/fusiondirectory.po
index 8b47dd47d1..96c63eb2cc 100644
--- a/samba/locale/ca/fusiondirectory.po
+++ b/samba/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
 msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Error de la configuració"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Avís"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nom"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Localització"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 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:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Avís"
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Error de la configuració"
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Nom"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Localització"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/cs_CZ/fusiondirectory.po b/samba/locale/cs_CZ/fusiondirectory.po
index a0bf229b4e..da27ac1a0e 100644
--- a/samba/locale/cs_CZ/fusiondirectory.po
+++ b/samba/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,288 +17,6 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
-msgstr "Nastavení skupiny pro službu Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Doména"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr "Samba doména"
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr "Informace o službě Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr "Typ skupiny"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Typ Samba skupiny"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Samba skupina"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Správci domény"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Doménoví uživatelé"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Doménoví hosté"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Chyba v nastavení"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
-msgstr "Ve stávajícím nastavení se nedaří nalézt SID skupiny!"
-
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Zvláštní skupina (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Varování"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Zjištěno nedefinované Samba SID. Opravte tento problém ručním zásahem!"
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr "Domény Samba"
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
-msgstr "Správa Samba domény"
-
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
-msgstr "Samba doména"
-
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
-msgstr "Nastavení Samba domény"
-
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
-msgstr "Název domény"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
-msgstr "Název této domény"
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
-msgstr "SID"
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
-msgstr "Bezpečnostní identifikátor této domény"
-
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
-msgstr "Základ RID"
-
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
-msgstr "Základ algoritmického relativního identifikátoru"
-
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
-msgstr "minimální stáří hesla"
-
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
-msgstr "Nejkratší umožněné stáří hesla v sekundách (výchozí: 0 => umožnit okamžitou změnu hesla)"
-
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
-msgstr "maximální stáří hesla"
-
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
-msgstr "Nejdelší přijatelné stáří hesla, v sekundách (výchozí: -1 => hesla platí stále)"
-
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
-msgstr "Následující RID identifikátor"
-
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
-msgstr "Příští NT relativní identifikátor pro cokoli"
-
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
-msgstr "RID identifikátor následující skupiny"
-
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
-msgstr "Příští NT relativní identifikátor pro skupiny"
-
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
-msgstr "Relativní identifikátor dalšího uživatele"
-
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
-msgstr "Příští NT relativní identifikátor pro vaše uživatele"
-
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
-msgstr "Nejkratší umožněná délka hesla"
-
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
-msgstr "Nejkratší přijatelná délka hesla (výchozí: 5 znaků)"
-
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
-msgstr "Délka historie hesla"
-
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
-msgstr "Hloubka historie hesel (výchozí: 0 => nepamatovat)"
-
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
-msgstr "Přihlásit se pro změnu hesla"
-
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
-msgstr "Přimět uživatele přihlásit se pro změnu hesla (výchozí: 0 => ne, 2 => ano)"
-
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
-msgstr "Doba trvání uzamčení"
-
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
-msgstr "Délka trvání uzamčení v minutách (výchozí: 30, hodnota -1 znamená uzamčeno napořád)"
-
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
-msgstr "Pozorovací okno uzamčení"
-
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
-msgstr "Za jak dlouho (v minutách) po uzamčení začít počítat čas od znovu (výchozí: 30)"
-
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
-msgstr "Práh uzamčení"
-
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
-msgstr "Uzamknout uživatele po nezdařených pokusech o přihlášení (výchozí: 0 => vypnuto)"
-
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
-msgstr "Vynutit odhlášení"
-
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
-msgstr "Pokud je mimo provozní dobu, samočinně odpojovat uživatele (výchozí: -1 => neodpojovat, 0 => odpojovat)"
-
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
-msgstr "Odmítnout změnu hesla k účtu stroje"
-
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
-msgstr "Umožnit změnu hesel počítačů (výchozí: 0 => neumožnit)"
-
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Počítač s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr "Informace o počítači s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Počítač s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "Název počítače s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Název"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "popis"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Stručný popis počítače s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "název domény Samba"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Umístění"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "Umístění počítače s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Nastavení sítě"
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -309,6 +27,12 @@ msgstr "Vaše instalace PHP neobsahuje mhash() ani funkci hash. Nelze tedy vytv
 msgid "Samba Munged Dial"
 msgstr "Samba – přístup přes vytáčené spojení"
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -338,6 +62,18 @@ msgstr "Umístění domovské složky"
 msgid "UNC path for the home drive"
 msgstr "Umístění (v UNC zápisu) domovského disku"
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Doména"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "název domény Samba"
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Umístění skriptu"
@@ -576,6 +312,18 @@ msgstr "cesta k domovskému úložišti"
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Správce uživatelských účtů v MS Windows umožňuje nejvýše 8 klientů!"
 
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Varování"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "Zjištěno nedefinované Samba SID. Opravte tento problém ručním zásahem!"
+
 #: personal/samba/class_sambaAccount.inc:532
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
@@ -654,6 +402,258 @@ msgid ""
 "group when activating the Samba tab of a user"
 msgstr ""
 
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr "Nastavení skupiny pro službu Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr "Samba doména"
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr "Informace o službě Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr "Typ skupiny"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Typ Samba skupiny"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Samba skupina"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Správci domény"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Doménoví uživatelé"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Doménoví hosté"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Chyba v nastavení"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr "Ve stávajícím nastavení se nedaří nalézt SID skupiny!"
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Zvláštní skupina (%d)"
+
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr "Domény Samba"
+
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
+msgstr "Správa Samba domény"
+
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
+msgstr "Samba doména"
+
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
+msgstr "Nastavení Samba domény"
+
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
+msgstr "Název domény"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
+msgstr "Název této domény"
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
+msgstr "SID"
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
+msgstr "Bezpečnostní identifikátor této domény"
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
+msgstr "Základ RID"
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
+msgstr "Základ algoritmického relativního identifikátoru"
+
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
+msgstr "minimální stáří hesla"
+
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
+msgstr "Nejkratší umožněné stáří hesla v sekundách (výchozí: 0 => umožnit okamžitou změnu hesla)"
+
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
+msgstr "maximální stáří hesla"
+
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
+msgstr "Nejdelší přijatelné stáří hesla, v sekundách (výchozí: -1 => hesla platí stále)"
+
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
+msgstr "Následující RID identifikátor"
+
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
+msgstr "Příští NT relativní identifikátor pro cokoli"
+
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
+msgstr "RID identifikátor následující skupiny"
+
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
+msgstr "Příští NT relativní identifikátor pro skupiny"
+
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
+msgstr "Relativní identifikátor dalšího uživatele"
+
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
+msgstr "Příští NT relativní identifikátor pro vaše uživatele"
+
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
+msgstr "Nejkratší umožněná délka hesla"
+
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
+msgstr "Nejkratší přijatelná délka hesla (výchozí: 5 znaků)"
+
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
+msgstr "Délka historie hesla"
+
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
+msgstr "Hloubka historie hesel (výchozí: 0 => nepamatovat)"
+
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
+msgstr "Přihlásit se pro změnu hesla"
+
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+msgstr "Přimět uživatele přihlásit se pro změnu hesla (výchozí: 0 => ne, 2 => ano)"
+
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
+msgstr "Doba trvání uzamčení"
+
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+msgstr "Délka trvání uzamčení v minutách (výchozí: 30, hodnota -1 znamená uzamčeno napořád)"
+
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
+msgstr "Pozorovací okno uzamčení"
+
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
+msgstr "Za jak dlouho (v minutách) po uzamčení začít počítat čas od znovu (výchozí: 30)"
+
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
+msgstr "Práh uzamčení"
+
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
+msgstr "Uzamknout uživatele po nezdařených pokusech o přihlášení (výchozí: 0 => vypnuto)"
+
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
+msgstr "Vynutit odhlášení"
+
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+msgstr "Pokud je mimo provozní dobu, samočinně odpojovat uživatele (výchozí: -1 => neodpojovat, 0 => odpojovat)"
+
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
+msgstr "Odmítnout změnu hesla k účtu stroje"
+
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
+msgstr "Umožnit změnu hesel počítačů (výchozí: 0 => neumožnit)"
+
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Počítač s MS Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
+msgstr "Informace o počítači s MS Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Počítač s MS Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
+msgstr "Název počítače s MS Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Název"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "popis"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
+msgstr "Stručný popis počítače s MS Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Umístění"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
+msgstr "Umístění počítače s MS Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
+msgstr "Nastavení sítě"
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr ""
+
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
 msgstr "Zadejte časové rozmezí, po které se tento uživatel bude moci přihlašovat."
diff --git a/samba/locale/de/fusiondirectory.po b/samba/locale/de/fusiondirectory.po
index d950c55615..fc7b2f06c5 100644
--- a/samba/locale/de/fusiondirectory.po
+++ b/samba/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,288 +17,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
-msgstr "Samba-Gruppeneinstellungen"
-
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Domäne"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr "Samba-Domäne"
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr "Samba-Informationen"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr "Gruppentyp"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Samba-Gruppentyp"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Samba-Gruppe"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Domänen-Administratoren"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Domänen-Benutzer"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Domänen-Gäste"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Konfigurationsfehler"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
-msgstr "Kann keine Gruppen-SID in Ihrer Konfiguration finden!"
-
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Spezielle Gruppe (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Warnung"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Undefinierte Samba SID festgestellt. Bitte beheben Sie dieses Problem manuell!"
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr "Samba-Domänen"
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
-msgstr "Samba-Domänenverwaltung"
-
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
-msgstr "Samba-Domäne"
-
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
-msgstr "Samba-Domäneneinstellungen"
-
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
-msgstr "Domänenname"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
-msgstr "Name dieser Domäne"
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
-msgstr "SID"
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
-msgstr "SID dieser Domäne"
-
-#: 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 "Minimales Passwortalter"
-
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
-msgstr "Minimales Passwortalter in Sekunden (Standard: 0 => sofortige Passwortänderung erlauben)"
-
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
-msgstr "Maximales Passwortalter"
-
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
-msgstr "Maximales Passwortalter in Sekunden (Standard: -1 => nie ablaufende Passwörter)"
-
-#: 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 "Minimale Passwortlänge"
-
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
-msgstr "Minimale Passwortlänge (Standard: 5)"
-
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
-msgstr "Passwortverlauflänge"
-
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
-msgstr "Länge der Passwortchronikeinträge (Standard: 0 => aus)"
-
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
-msgstr "Anmelden zum Ändern des Passworts"
-
-#: 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 "Dauer der Sperre"
-
-#: 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 "Abmelden erzwingen"
-
-#: 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 "Verweigere Änderung der Passwörter für Computerkonten"
-
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
-msgstr "Rechnerpasswortänderungen erlauben (Standard: 0 => aus)"
-
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Windows-Arbeitsstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr "Windows-Arbeitsstationinformation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Windows Arbeitsstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "Der Name der winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Name"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Beschreibung"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Eine kurze Beschreibung der winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Samba Domänen-Name"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Ort"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "Der Ort der winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Netzwerkeinstellungen"
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -309,6 +27,12 @@ msgstr "Ihre PHP-Installation hat nicht den mhash() bzw. die hash-Funktion. MD4-
 msgid "Samba Munged Dial"
 msgstr "Samba Munged Dial"
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -338,6 +62,18 @@ msgstr "Homeverzeichnis-Pfad"
 msgid "UNC path for the home drive"
 msgstr "UNC-Pfad für das Homelaufwerk"
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Domäne"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Samba Domänen-Name"
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Anmeldeskript"
@@ -576,6 +312,18 @@ msgstr "Basis-Pfad"
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Der Windows Benutzermanager erlaubt maximal acht Clients!"
 
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Warnung"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "Undefinierte Samba SID festgestellt. Bitte beheben Sie dieses Problem manuell!"
+
 #: personal/samba/class_sambaAccount.inc:532
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
@@ -654,6 +402,258 @@ msgid ""
 "group when activating the Samba tab of a user"
 msgstr ""
 
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr "Samba-Gruppeneinstellungen"
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr "Samba-Domäne"
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr "Samba-Informationen"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr "Gruppentyp"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Samba-Gruppentyp"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Samba-Gruppe"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Domänen-Administratoren"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Domänen-Benutzer"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Domänen-Gäste"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Konfigurationsfehler"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr "Kann keine Gruppen-SID in Ihrer Konfiguration finden!"
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Spezielle Gruppe (%d)"
+
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr "Samba-Domänen"
+
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
+msgstr "Samba-Domänenverwaltung"
+
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
+msgstr "Samba-Domäne"
+
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
+msgstr "Samba-Domäneneinstellungen"
+
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
+msgstr "Domänenname"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
+msgstr "Name dieser Domäne"
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
+msgstr "SID"
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
+msgstr "SID dieser Domäne"
+
+#: 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 "Minimales Passwortalter"
+
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
+msgstr "Minimales Passwortalter in Sekunden (Standard: 0 => sofortige Passwortänderung erlauben)"
+
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
+msgstr "Maximales Passwortalter"
+
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
+msgstr "Maximales Passwortalter in Sekunden (Standard: -1 => nie ablaufende Passwörter)"
+
+#: 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 "Minimale Passwortlänge"
+
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
+msgstr "Minimale Passwortlänge (Standard: 5)"
+
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
+msgstr "Passwortverlauflänge"
+
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
+msgstr "Länge der Passwortchronikeinträge (Standard: 0 => aus)"
+
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
+msgstr "Anmelden zum Ändern des Passworts"
+
+#: 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 "Dauer der Sperre"
+
+#: 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 "Abmelden erzwingen"
+
+#: 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 "Verweigere Änderung der Passwörter für Computerkonten"
+
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
+msgstr "Rechnerpasswortänderungen erlauben (Standard: 0 => aus)"
+
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Windows-Arbeitsstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
+msgstr "Windows-Arbeitsstationinformation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Windows Arbeitsstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
+msgstr "Der Name der winstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Name"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Beschreibung"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
+msgstr "Eine kurze Beschreibung der winstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Ort"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
+msgstr "Der Ort der winstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
+msgstr "Netzwerkeinstellungen"
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr ""
+
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
 msgstr "Wählen Sie die Stunden, in denen der Benutzer angemeldet sein darf"
diff --git a/samba/locale/el_GR/fusiondirectory.po b/samba/locale/el_GR/fusiondirectory.po
index 9ce907577b..327340dbc3 100644
--- a/samba/locale/el_GR/fusiondirectory.po
+++ b/samba/locale/el_GR/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -20,288 +20,6 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Λογισμικό Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
-msgstr "Ρυθμίσεις ομάδας Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Τομέας"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr "Τομέας Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr "Πληροφορίες Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr "Τύπος ομάδας"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Τύπος ομάδας Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Ομάδα Samba"
-
-#: 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 "Δεν μπορεί να βρεθεί το SID της ομάδας στις ρυθμίσεις σας!"
-
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Ειδική ομάδα (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Προειδοποίηση"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Ανιχνεύθηκε απροσριόριστο Samba SID. Παρακαλείστε να διορθώσετε χειροκίνητα το πρόβλημα."
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr "Τομείς Samba"
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
-msgstr "Διαχείριση Τομέα Samba"
-
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
-msgstr "Τομέας Samba"
-
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
-msgstr "Ρυθμίσεις τομέα Samba"
-
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-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 "SID"
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
-msgstr "Το SID αυτού του τομέα"
-
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
-msgstr "Βάση Rid"
-
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
-msgstr "Συντελεστής Βάσης Rid"
-
-#: 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 "Ελάχιστος χρόνος ύπαρξης του κωδικού, σε δευτερόλεπτα (προκαθορισμένος: 0 => επιτρέπει την άμεση αλλαγή του κωδικού)"
-
-#: 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 "Μέγιστος χρόνος ύπαρξης του κωδικού, σε δευτερόλεπτα (προκαθορισμένος: -1 => κωδικοί που δεν λήγουν ποτέ)"
-
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
-msgstr "Επόμενο RID"
-
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
-msgstr "Απόδοση επόμενου NT Rid σε οτιδήποτε (ομάδες, χρήστες)"
-
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
-msgstr "Επόμενο RID ομάδας"
-
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
-msgstr "Απόδοση επόμενου NT Rid σε ομάδες"
-
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
-msgstr "Επόμενου χρήστη RID"
-
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
-msgstr "Απόδοση επόμενου NT Rid σε χρήστες"
-
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
-msgstr "Ελάχιστο μήκος χαρακτήρων κωδικού"
-
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
-msgstr "Ελάχιστο μήκος χαρακτήρων κωδικού (προκαθορισμένο: 5)"
-
-#: 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 "Το πλήθος εγγραφών των κωδικών στο ιστορικό (προκαθορισμένο: 0 => απενεργοποιημένο)"
-
-#: 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 "Υποχρεωτική σύνδεση χρηστών για αλλαγή κωδικού (προκαθορισμένο: 0 => απενεργοποιημένο, 2 => ενεργοποιημένο)"
-
-#: 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 "Διάρκεια κλειδώματος σε λεπτά (προκαθορισμένο: 30, -1 => για πάντα)"
-
-#: 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 "Επανεκκίνηση χρόνου μετά από κλείδωμα σε λεπτά (προκαθορισμένο: 30) "
-
-#: 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 "Κλείδωμα χρηστών μετά από εσφαλμένες προσπάθειες σύνδεσης (προκαθορισμένο: 0 => απενεργοποιημένο)"
-
-#: 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 "Αποσύνδεση χρηστών εκτός των ωρών επιτρεπόμενης σύνδεσης (προκαθορισμένο: -1 => απενεργοποιημένο, 0 => ενεργοποιημένο)"
-
-#: 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 "Επίτρεψε την αλλαγή κωδικού του μηχανήματος (προκαθορισμένο: 0 => απενεργοποιημένο)"
-
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr "Πληροφορίες σταθμού εργασίας με Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Σταθμός εργασίας με Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "Το όνομα του σταθμού εργασίας με Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Όνομα"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Περιγραφή"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Μία σύντομη περιγραφή του σταθμού εργασίας με Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Όνομα τομέα του Samba"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Τοποθεσία"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "Η τοποθεσία του σταθμού εργασίας με Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Ρυθμίσεις δικτύου"
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -312,6 +30,12 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr "Δικαιώματα κλήσης Samba"
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Λογισμικό Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -341,6 +65,18 @@ msgstr "Διαδρομή προσωπικού καταλόγου"
 msgid "UNC path for the home drive"
 msgstr "Διαδρομή UNC για τον προσωπικό οδηγό"
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Τομέας"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Όνομα τομέα του Samba"
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Διαδρομή σεναρίων ενεργειών"
@@ -579,6 +315,18 @@ msgstr "Μονοπάτι προσωπικού καταλόγου"
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Ο διαχειριστής χρηστών των Windows επιτρέπει μέγιστο αριθμό 8 πελατών"
 
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Προειδοποίηση"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "Ανιχνεύθηκε απροσριόριστο Samba SID. Παρακαλείστε να διορθώσετε χειροκίνητα το πρόβλημα."
+
 #: personal/samba/class_sambaAccount.inc:532
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
@@ -657,6 +405,258 @@ msgid ""
 "group when activating the Samba tab of a user"
 msgstr ""
 
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr "Ρυθμίσεις ομάδας Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr "Τομέας Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr "Πληροφορίες Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr "Τύπος ομάδας"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Τύπος ομάδας Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Ομάδα Samba"
+
+#: 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 "Δεν μπορεί να βρεθεί το SID της ομάδας στις ρυθμίσεις σας!"
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Ειδική ομάδα (%d)"
+
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr "Τομείς Samba"
+
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
+msgstr "Διαχείριση Τομέα Samba"
+
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
+msgstr "Τομέας Samba"
+
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
+msgstr "Ρυθμίσεις τομέα Samba"
+
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+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 "SID"
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
+msgstr "Το SID αυτού του τομέα"
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
+msgstr "Βάση Rid"
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
+msgstr "Συντελεστής Βάσης Rid"
+
+#: 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 "Ελάχιστος χρόνος ύπαρξης του κωδικού, σε δευτερόλεπτα (προκαθορισμένος: 0 => επιτρέπει την άμεση αλλαγή του κωδικού)"
+
+#: 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 "Μέγιστος χρόνος ύπαρξης του κωδικού, σε δευτερόλεπτα (προκαθορισμένος: -1 => κωδικοί που δεν λήγουν ποτέ)"
+
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
+msgstr "Επόμενο RID"
+
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
+msgstr "Απόδοση επόμενου NT Rid σε οτιδήποτε (ομάδες, χρήστες)"
+
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
+msgstr "Επόμενο RID ομάδας"
+
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
+msgstr "Απόδοση επόμενου NT Rid σε ομάδες"
+
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
+msgstr "Επόμενου χρήστη RID"
+
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
+msgstr "Απόδοση επόμενου NT Rid σε χρήστες"
+
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
+msgstr "Ελάχιστο μήκος χαρακτήρων κωδικού"
+
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
+msgstr "Ελάχιστο μήκος χαρακτήρων κωδικού (προκαθορισμένο: 5)"
+
+#: 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 "Το πλήθος εγγραφών των κωδικών στο ιστορικό (προκαθορισμένο: 0 => απενεργοποιημένο)"
+
+#: 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 "Υποχρεωτική σύνδεση χρηστών για αλλαγή κωδικού (προκαθορισμένο: 0 => απενεργοποιημένο, 2 => ενεργοποιημένο)"
+
+#: 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 "Διάρκεια κλειδώματος σε λεπτά (προκαθορισμένο: 30, -1 => για πάντα)"
+
+#: 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 "Επανεκκίνηση χρόνου μετά από κλείδωμα σε λεπτά (προκαθορισμένο: 30) "
+
+#: 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 "Κλείδωμα χρηστών μετά από εσφαλμένες προσπάθειες σύνδεσης (προκαθορισμένο: 0 => απενεργοποιημένο)"
+
+#: 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 "Αποσύνδεση χρηστών εκτός των ωρών επιτρεπόμενης σύνδεσης (προκαθορισμένο: -1 => απενεργοποιημένο, 0 => ενεργοποιημένο)"
+
+#: 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 "Επίτρεψε την αλλαγή κωδικού του μηχανήματος (προκαθορισμένο: 0 => απενεργοποιημένο)"
+
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Winstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
+msgstr "Πληροφορίες σταθμού εργασίας με Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Σταθμός εργασίας με Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
+msgstr "Το όνομα του σταθμού εργασίας με Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Όνομα"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
+msgstr "Μία σύντομη περιγραφή του σταθμού εργασίας με Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Τοποθεσία"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
+msgstr "Η τοποθεσία του σταθμού εργασίας με Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
+msgstr "Ρυθμίσεις δικτύου"
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr ""
+
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
 msgstr "Καθορίστε τις ώρες που αυτός ο χρήστης επιτρέπεται να εισέλθει"
diff --git a/samba/locale/es/fusiondirectory.po b/samba/locale/es/fusiondirectory.po
index c56c56c0a4..811c62e0c3 100644
--- a/samba/locale/es/fusiondirectory.po
+++ b/samba/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,288 +17,6 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: 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_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Tipo de grupo de samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Grupo de samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Administradores del dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Usuarios del dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Invitados del dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Error en la configuración"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
-msgstr "¡No se puede encontrar SID de grupo en el archivo de configuración!"
-
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Grupo especial (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Se ha detectado un SID Samba sin definir. ¡Por favor solucione este problema manualmente!"
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr ""
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-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_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Propiedades"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
-msgstr "Nombre de dominio"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
-msgstr ""
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
-msgstr "SID"
-
-#: 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 "Fecha mínima de contraseña"
-
-#: 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 "Fecha máxima de contraseña"
-
-#: 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 "Duración del bloqueo"
-
-#: 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 "No se permite modificar la contraseña de máquina"
-
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
-msgstr ""
-
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Estación de trabajo Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Estaciones de trabajo Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Nombre de dominio samba"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Localización"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -309,6 +27,12 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -338,6 +62,18 @@ msgstr ""
 msgid "UNC path for the home drive"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Dominio"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Nombre de dominio samba"
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Ruta del Script"
@@ -576,6 +312,18 @@ msgstr "Ruta inicial"
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Aviso"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "Se ha detectado un SID Samba sin definir. ¡Por favor solucione este problema manualmente!"
+
 #: personal/samba/class_sambaAccount.inc:532
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
@@ -654,6 +402,258 @@ msgid ""
 "group when activating the Samba tab of a user"
 msgstr ""
 
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Tipo de grupo de samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Grupo de samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Administradores del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Usuarios del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Invitados del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Error en la configuración"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr "¡No se puede encontrar SID de grupo en el archivo de configuración!"
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
+
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr ""
+
+#: admin/samba/class_sambaDomainManagement.inc:36
+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_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Propiedades"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
+msgstr "Nombre de dominio"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
+msgstr "SID"
+
+#: 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 "Fecha mínima de contraseña"
+
+#: 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 "Fecha máxima de contraseña"
+
+#: 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 "Duración del bloqueo"
+
+#: 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 "No se permite modificar la contraseña de máquina"
+
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Estación de trabajo Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Estaciones de trabajo Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Descripción"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Localización"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr ""
+
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
 msgstr "Introducir las horas en que este usuario tendrá permiso de inicio de sesión"
diff --git a/samba/locale/es_CO/fusiondirectory.po b/samba/locale/es_CO/fusiondirectory.po
index 75858a70cd..ff8cb0b05d 100644
--- a/samba/locale/es_CO/fusiondirectory.po
+++ b/samba/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr "Su instalación PHP no tiene mhash() u otra función hash. No es posible hacer hashes MD4."
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
 msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr ""
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Dominio"
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Error de configuración"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Precacuión"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Propiedades"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
+msgstr "deshabilitado"
+
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nombre"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Descripción"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Ubicación"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
-msgstr "Su instalación PHP no tiene mhash() u otra función hash. No es posible hacer hashes MD4."
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
+msgstr "Confianza del Sistema"
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
-msgstr ""
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
+msgstr "Permitir a este usuario conectarse a esta lista de hosts."
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Precacuión"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
-msgstr "deshabilitado"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Error de configuración"
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
-msgstr ""
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Propiedades"
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
-msgstr "Confianza del Sistema"
-
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Permitir a este usuario conectarse a esta lista de hosts."
-
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Nombre"
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Descripción"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Ubicación"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/es_VE/fusiondirectory.po b/samba/locale/es_VE/fusiondirectory.po
index c45ca55885..b53114093f 100644
--- a/samba/locale/es_VE/fusiondirectory.po
+++ b/samba/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,288 +17,6 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: 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_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Tipo de grupo de samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Grupo de samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Administradores del dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Usuarios del dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Invitados del dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Error en la configuración"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
-msgstr "¡No se puede encontrar SID de grupo en el archivo de configuración!"
-
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Grupo especial (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Se ha detectado un SID Samba sin definir. ¡Por favor solucione este problema manualmente!"
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr ""
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-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_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Propiedades"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
-msgstr "Nombre de dominio"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
-msgstr ""
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
-msgstr "SID"
-
-#: 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 "Fecha mínima de contraseña"
-
-#: 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 "Fecha máxima de contraseña"
-
-#: 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 "Duración del bloqueo"
-
-#: 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 "No se permite modificar la contraseña de máquina"
-
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
-msgstr ""
-
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Estación de trabajo Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Estaciones de trabajo Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Nombre de dominio samba"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Localización"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -309,6 +27,12 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -338,6 +62,18 @@ msgstr ""
 msgid "UNC path for the home drive"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Dominio"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Nombre de dominio samba"
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Ruta del Script"
@@ -576,6 +312,18 @@ msgstr "Ruta inicial"
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "El manejador de usuarios de Windows permite un máximo de ocho clientes!"
 
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Aviso"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "Se ha detectado un SID Samba sin definir. ¡Por favor solucione este problema manualmente!"
+
 #: personal/samba/class_sambaAccount.inc:532
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
@@ -654,6 +402,258 @@ msgid ""
 "group when activating the Samba tab of a user"
 msgstr ""
 
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Tipo de grupo de samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Grupo de samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Administradores del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Usuarios del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Invitados del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Error en la configuración"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr "¡No se puede encontrar SID de grupo en el archivo de configuración!"
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
+
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr ""
+
+#: admin/samba/class_sambaDomainManagement.inc:36
+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_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Propiedades"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
+msgstr "Nombre de dominio"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
+msgstr "SID"
+
+#: 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 "Fecha mínima de contraseña"
+
+#: 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 "Fecha máxima de contraseña"
+
+#: 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 "Duración del bloqueo"
+
+#: 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 "No se permite modificar la contraseña de máquina"
+
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Estación de trabajo Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Estaciones de trabajo Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Descripción"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Localización"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr ""
+
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
 msgstr "Introducir las horas en que este usuario tendrá permiso de inicio de sesión"
diff --git a/samba/locale/fa_IR/fusiondirectory.po b/samba/locale/fa_IR/fusiondirectory.po
index 1c6dcc3938..fb590b048d 100644
--- a/samba/locale/fa_IR/fusiondirectory.po
+++ b/samba/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/fi_FI/fusiondirectory.po b/samba/locale/fi_FI/fusiondirectory.po
index 94fb5116ad..cf4391ae13 100644
--- a/samba/locale/fi_FI/fusiondirectory.po
+++ b/samba/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
 msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Varoitus"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Ominaisuudet"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nimi"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Kuvaus"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 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:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Varoitus"
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
-msgstr ""
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Ominaisuudet"
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Nimi"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Kuvaus"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/fr/fusiondirectory.po b/samba/locale/fr/fusiondirectory.po
index 8f1b728588..5f335c7e86 100644
--- a/samba/locale/fr/fusiondirectory.po
+++ b/samba/locale/fr/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:27+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-10-15 15:34+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,288 +19,6 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
-msgstr "Paramètres du groupe Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Domaine"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr "Domaine Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr "Informations Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr "Type de groupe"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Type de groupe Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Groupe Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Administrateurs du domaine"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Utilisateurs du domaine"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Invités du domaine"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Erreur de configuration"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
-msgstr "Impossible de trouver le SID de ce groupe dans votre configuration !"
-
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Groupe spécial (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Avertissement"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Le SID Samba n’est pas défini. Veuillez corriger ceci manuellement !"
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr "Domaines Samba"
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
-msgstr "Gestion des domaines Samba"
-
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
-msgstr "Domaine Samba"
-
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
-msgstr "Configuration domaine Samba"
-
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Propriétés"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
-msgstr "Nom du domaine"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
-msgstr "Nom du domaine"
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
-msgstr "SID"
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
-msgstr "SID du domaine "
-
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
-msgstr "Base du RID"
-
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
-msgstr "Base algorithmique du RID"
-
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
-msgstr "Durée de vie minimale du mot de passe"
-
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
-msgstr "Durée minimum de validité du mot de passe, en secondes (défaut : 0 => permet le changement immédiat du mot de passe)"
-
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
-msgstr "Durée de vie maximale du mot de passe"
-
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
-msgstr "Durée maximum de validité du mot de passe, en secondes (défaut : -1 => le mot de passe n'expire jamais)"
-
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
-msgstr "Prochain RID"
-
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
-msgstr "Prochain RID NT à donner"
-
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
-msgstr "Prochain RID de groupe"
-
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
-msgstr "Prochain RID NT à donner pour les groupes"
-
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
-msgstr "Prochain RID utilisateur"
-
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
-msgstr "Prochain RID NT à donner pour les utilisateurs"
-
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
-msgstr "Taille minimale du mot de passe"
-
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
-msgstr "Taille de mot de passe minimale (défaut : 5)"
-
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
-msgstr "Taille de l'historique des mots de passe"
-
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
-msgstr "Taille de l'historique des mots de passe (défaut : 0 => désactivé)"
-
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
-msgstr "Se connecter pour changer de mot de passe"
-
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
-msgstr "Force les utilisateurs à se connecter pour changer leur mot de passe (par défaut : 0 => désactivé, 2 => activé) "
-
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
-msgstr "Durée de verrouillage "
-
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
-msgstr "Durée du blocage du compte en minutes (par défaut : 30, -1 => perpétuellement)"
-
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
-msgstr "Fenêtre de verrouillage"
-
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
-msgstr "Temps avant remise à zéro après verrouillage, en minutes (défaut : 30)"
-
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
-msgstr "Seuil de blocage"
-
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
-msgstr "Verrouille le compte utilisateur après tant d’échecs de tentative de connexion (défaut : 0 => désactivé)"
-
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
-msgstr "Forcer la déconnexion"
-
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
-msgstr "Déconnecte les utilisateurs en dehors des heures de connexion (défaut : -1 => désactivé, 0 => actif)"
-
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
-msgstr "Refuser le changement de mot de passe de la machine"
-
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
-msgstr "Autorise les changements de mot de passe machine (défaut : 0 => désactivé)"
-
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr "Mettre a jour les partages Samba"
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "PC Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr "Information du PC Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Station de travail Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "Nom du PC Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nom"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Description"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Une courte description de cette machine Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Nom du domaine Samba"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Lieu"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "Le lieu de la machine Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Configuration réseau"
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -311,6 +29,12 @@ msgstr "Votre installation de PHP ne dispose pas de la fonction mhash() ni de la
 msgid "Samba Munged Dial"
 msgstr "Samba Munged Dial"
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -340,6 +64,18 @@ msgstr "Chemin du répertoire personnel"
 msgid "UNC path for the home drive"
 msgstr "Chemin UNC du répertoire personnel de cet utilisateur"
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Domaine"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Nom du domaine Samba"
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Chemin du Script"
@@ -578,6 +314,18 @@ msgstr "Chemin du répertoire personnel"
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Le gestionnaire d'utilisateurs Windows accepte huit clients maximum !"
 
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Avertissement"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "Le SID Samba n’est pas défini. Veuillez corriger ceci manuellement !"
+
 #: personal/samba/class_sambaAccount.inc:532
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
@@ -656,6 +404,258 @@ msgid ""
 "group when activating the Samba tab of a user"
 msgstr "Émettre un avertissement si le groupe primaire POSIX ne peut pas être converti en groupe primaire Samba lors de l'activation de l'onglet Samba d'un utilisateur"
 
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr "Paramètres du groupe Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr "Domaine Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr "Informations Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr "Type de groupe"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Type de groupe Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Groupe Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Administrateurs du domaine"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Utilisateurs du domaine"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Invités du domaine"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Erreur de configuration"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr "Impossible de trouver le SID de ce groupe dans votre configuration !"
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Groupe spécial (%d)"
+
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr "Domaines Samba"
+
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
+msgstr "Gestion des domaines Samba"
+
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
+msgstr "Domaine Samba"
+
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
+msgstr "Configuration domaine Samba"
+
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Propriétés"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
+msgstr "Nom du domaine"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
+msgstr "Nom du domaine"
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
+msgstr "SID"
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
+msgstr "SID du domaine "
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
+msgstr "Base du RID"
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
+msgstr "Base algorithmique du RID"
+
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
+msgstr "Durée de vie minimale du mot de passe"
+
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
+msgstr "Durée minimum de validité du mot de passe, en secondes (défaut : 0 => permet le changement immédiat du mot de passe)"
+
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
+msgstr "Durée de vie maximale du mot de passe"
+
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
+msgstr "Durée maximum de validité du mot de passe, en secondes (défaut : -1 => le mot de passe n'expire jamais)"
+
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
+msgstr "Prochain RID"
+
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
+msgstr "Prochain RID NT à donner"
+
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
+msgstr "Prochain RID de groupe"
+
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
+msgstr "Prochain RID NT à donner pour les groupes"
+
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
+msgstr "Prochain RID utilisateur"
+
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
+msgstr "Prochain RID NT à donner pour les utilisateurs"
+
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
+msgstr "Taille minimale du mot de passe"
+
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
+msgstr "Taille de mot de passe minimale (défaut : 5)"
+
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
+msgstr "Taille de l'historique des mots de passe"
+
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
+msgstr "Taille de l'historique des mots de passe (défaut : 0 => désactivé)"
+
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
+msgstr "Se connecter pour changer de mot de passe"
+
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+msgstr "Force les utilisateurs à se connecter pour changer leur mot de passe (par défaut : 0 => désactivé, 2 => activé) "
+
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
+msgstr "Durée de verrouillage "
+
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+msgstr "Durée du blocage du compte en minutes (par défaut : 30, -1 => perpétuellement)"
+
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
+msgstr "Fenêtre de verrouillage"
+
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
+msgstr "Temps avant remise à zéro après verrouillage, en minutes (défaut : 30)"
+
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
+msgstr "Seuil de blocage"
+
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
+msgstr "Verrouille le compte utilisateur après tant d’échecs de tentative de connexion (défaut : 0 => désactivé)"
+
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
+msgstr "Forcer la déconnexion"
+
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+msgstr "Déconnecte les utilisateurs en dehors des heures de connexion (défaut : -1 => désactivé, 0 => actif)"
+
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
+msgstr "Refuser le changement de mot de passe de la machine"
+
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
+msgstr "Autorise les changements de mot de passe machine (défaut : 0 => désactivé)"
+
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "PC Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
+msgstr "Information du PC Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Station de travail Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
+msgstr "Nom du PC Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Nom"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Description"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
+msgstr "Une courte description de cette machine Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Lieu"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
+msgstr "Le lieu de la machine Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
+msgstr "Configuration réseau"
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr "Mettre a jour les partages Samba"
+
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
 msgstr "Indiquez les heures auquel l'utilisateur est autorisé à se connecter"
diff --git a/samba/locale/hu_HU/fusiondirectory.po b/samba/locale/hu_HU/fusiondirectory.po
index 2cccf2b8b2..e1704bc1b3 100644
--- a/samba/locale/hu_HU/fusiondirectory.po
+++ b/samba/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Név"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Leírás"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Név"
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Leírás"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/id/fusiondirectory.po b/samba/locale/id/fusiondirectory.po
index 64bb5f37fd..b66f93565b 100644
--- a/samba/locale/id/fusiondirectory.po
+++ b/samba/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/it_IT/fusiondirectory.po b/samba/locale/it_IT/fusiondirectory.po
index 959fb1a2a7..df40490c62 100644
--- a/samba/locale/it_IT/fusiondirectory.po
+++ b/samba/locale/it_IT/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-10-03 15:47+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -20,288 +20,6 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
-msgstr "Impostazioni di gruppi Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr "Nome di dominio di Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr "Informazioni su Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr "Tipo di gruppo"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Tipo di gruppo Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Gruppo Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Amministratori di Dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Utenti di Dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Ospiti di Dominio"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Errore di configurazione"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
-msgstr "Impossibile trovare il SID del gruppo nella tua configurazione !"
-
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Gruppo speciale (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "É stato trovato un SID Samba che non è definito. Correggi manualmente !"
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr "Nomi di dominio di Samba"
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
-msgstr "Gestione di dominio di Samba"
-
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
-msgstr "Nome di dominio di Samba"
-
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
-msgstr "Impostazioni di dominio di Samba"
-
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Proprietà"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
-msgstr "Nome del dominio"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
-msgstr "Nome del dominio"
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
-msgstr "SID"
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
-msgstr "SID di questo dominio"
-
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
-msgstr "Base del RID"
-
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
-msgstr "Algoritmo RID base"
-
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
-msgstr "Durata di vita minima della password"
-
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
-msgstr "Anzianità massima della password, in secondi (predefinito : 0 => permette modifica immediata della password)"
-
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
-msgstr "Durata di vita massima della password"
-
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
-msgstr "Anzianità massima della password, in secondi (default: -1 -> la password non ha scadenza)"
-
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
-msgstr "RID successivo"
-
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
-msgstr "Prossimo NT libero per emettere gruppi"
-
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
-msgstr "Gruppo RID successivo"
-
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
-msgstr "Prossimo NT libero per emettere gruppi"
-
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
-msgstr "Utente RID successivo"
-
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
-msgstr "Prossimo NT libero per emettere utenti"
-
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
-msgstr "Lunghezza minima per la password"
-
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
-msgstr "Lunghezza minima della password (predefinito: 5) "
-
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
-msgstr "Cronologia della lunghezza delle password"
-
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
-msgstr "Lunghezza dell'history di voci della password (predefinito : 0 => off)"
-
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
-msgstr "Logon per cambiare la password"
-
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
-msgstr "Obbliga gli Utenti a disconnettersi per modificare la password (predefinito: 0 => off, 2 => on)"
-
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
-msgstr "Durata del blocco"
-
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
-msgstr "Durata del blocco in minuti (default: 30, -1 -> per sempre)"
-
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
-msgstr "Finestra di osservazione Lockout"
-
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
-msgstr "Tempo di reset dopo il blocco, in minuti (default: 30)"
-
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
-msgstr "Durata del blocco"
-
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
-msgstr "Lockout utenti dopo tentativi errati di login (predefinito : 0 => off)"
-
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
-msgstr "Forza il log off"
-
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
-msgstr "Disconnetti Utenti al di fuori degli orari di accesso (predefinito : -1 => off, 0 => on)"
-
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
-msgstr "Rifiuta la modifica della password del computer"
-
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
-msgstr "Permettere cambiamento password del computer (predefinito: 0 => off) "
-
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr "Aggiornare condivisioni Samba"
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr "Informazione terminale Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Workstation Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "Il nome del computer Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Descrizione"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Una breve descrizione del computer Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Nome di dominio Samba"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Località"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "L'ubicazione del computer Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Impostazioni di rete"
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -312,6 +30,12 @@ msgstr "La vostra installazione PHP non ha né mhash() né la funzione hash. Non
 msgid "Samba Munged Dial"
 msgstr "Samba Munged Dial"
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -341,6 +65,18 @@ msgstr "Path della cartella personale"
 msgid "UNC path for the home drive"
 msgstr "Path UNC per la cartella personale"
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Dominio"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Nome di dominio Samba"
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Path dello script"
@@ -579,6 +315,18 @@ msgstr "Path della cartella personale dell'utente"
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Il gestore degli utenti di Windows accetta solo 8 clienti alla volta!"
 
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Avvertimento"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "É stato trovato un SID Samba che non è definito. Correggi manualmente !"
+
 #: personal/samba/class_sambaAccount.inc:532
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
@@ -657,6 +405,258 @@ msgid ""
 "group when activating the Samba tab of a user"
 msgstr "Emettere un avviso se il gruppo primario di POSIX non può essere convertito in un gruppo primario di Samba quando si attiva la scheda Samba di un utente"
 
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr "Impostazioni di gruppi Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr "Nome di dominio di Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr "Informazioni su Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr "Tipo di gruppo"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Tipo di gruppo Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Gruppo Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Amministratori di Dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Utenti di Dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Ospiti di Dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Errore di configurazione"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr "Impossibile trovare il SID del gruppo nella tua configurazione !"
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Gruppo speciale (%d)"
+
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr "Nomi di dominio di Samba"
+
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
+msgstr "Gestione di dominio di Samba"
+
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
+msgstr "Nome di dominio di Samba"
+
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
+msgstr "Impostazioni di dominio di Samba"
+
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Proprietà"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
+msgstr "Nome del dominio"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
+msgstr "Nome del dominio"
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
+msgstr "SID"
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
+msgstr "SID di questo dominio"
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
+msgstr "Base del RID"
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
+msgstr "Algoritmo RID base"
+
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
+msgstr "Durata di vita minima della password"
+
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
+msgstr "Anzianità massima della password, in secondi (predefinito : 0 => permette modifica immediata della password)"
+
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
+msgstr "Durata di vita massima della password"
+
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
+msgstr "Anzianità massima della password, in secondi (default: -1 -> la password non ha scadenza)"
+
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
+msgstr "RID successivo"
+
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
+msgstr "Prossimo NT libero per emettere gruppi"
+
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
+msgstr "Gruppo RID successivo"
+
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
+msgstr "Prossimo NT libero per emettere gruppi"
+
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
+msgstr "Utente RID successivo"
+
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
+msgstr "Prossimo NT libero per emettere utenti"
+
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
+msgstr "Lunghezza minima per la password"
+
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
+msgstr "Lunghezza minima della password (predefinito: 5) "
+
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
+msgstr "Cronologia della lunghezza delle password"
+
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
+msgstr "Lunghezza dell'history di voci della password (predefinito : 0 => off)"
+
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
+msgstr "Logon per cambiare la password"
+
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+msgstr "Obbliga gli Utenti a disconnettersi per modificare la password (predefinito: 0 => off, 2 => on)"
+
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
+msgstr "Durata del blocco"
+
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+msgstr "Durata del blocco in minuti (default: 30, -1 -> per sempre)"
+
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
+msgstr "Finestra di osservazione Lockout"
+
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
+msgstr "Tempo di reset dopo il blocco, in minuti (default: 30)"
+
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
+msgstr "Durata del blocco"
+
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
+msgstr "Lockout utenti dopo tentativi errati di login (predefinito : 0 => off)"
+
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
+msgstr "Forza il log off"
+
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+msgstr "Disconnetti Utenti al di fuori degli orari di accesso (predefinito : -1 => off, 0 => on)"
+
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
+msgstr "Rifiuta la modifica della password del computer"
+
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
+msgstr "Permettere cambiamento password del computer (predefinito: 0 => off) "
+
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Winstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
+msgstr "Informazione terminale Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Workstation Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
+msgstr "Il nome del computer Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Nome"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Descrizione"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
+msgstr "Una breve descrizione del computer Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Località"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
+msgstr "L'ubicazione del computer Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
+msgstr "Impostazioni di rete"
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr "Aggiornare condivisioni Samba"
+
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
 msgstr "Specifica gli orari in cui l'utente è autorizzato a connettersi"
diff --git a/samba/locale/lv/fusiondirectory.po b/samba/locale/lv/fusiondirectory.po
index 621203eced..086b6c6e14 100644
--- a/samba/locale/lv/fusiondirectory.po
+++ b/samba/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
 msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Brīdinājums"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Vārds "
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Apraksts"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Atrašanās vieta"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 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:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Brīdinājums"
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Vārds "
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Apraksts"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Atrašanās vieta"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/nb/fusiondirectory.po b/samba/locale/nb/fusiondirectory.po
index 42d9ca94df..5335750f49 100644
--- a/samba/locale/nb/fusiondirectory.po
+++ b/samba/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Navn"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Beskrivelse"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
-msgstr ""
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Egenskaper"
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Navn"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/nl/fusiondirectory.po b/samba/locale/nl/fusiondirectory.po
index b9466c5ddf..18be8d5eae 100644
--- a/samba/locale/nl/fusiondirectory.po
+++ b/samba/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,288 +17,6 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: 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_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Domein"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Samba groep type"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Samba groep"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Windows beheerders"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Windows gebruikers"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Windows gasten"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Configuratie fout"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
-msgstr "Kan de goep SID niet vinden in je configuratie!"
-
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Speciale groep (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Er is een ongedefinieerd SambaSID geselecteerd. Repareer dit probleem a.u.b. handmatig!"
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr ""
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-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_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
-msgstr "Domein naam"
-
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
-msgstr ""
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
-msgstr "SID"
-
-#: 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 "Minimum paswoord leeftijd"
-
-#: 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 "Maximum paswoord leeftijd"
-
-#: 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 "Lockout tijd"
-
-#: 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 "Weiger machine paswoord wijziging"
-
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
-msgstr ""
-
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Windows werkstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Windows werkstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Naam"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Omschrijving"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Sambe domeinnaam"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Plaats"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -309,6 +27,12 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -338,6 +62,18 @@ msgstr ""
 msgid "UNC path for the home drive"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Domein"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Sambe domeinnaam"
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Inlogscript"
@@ -576,6 +312,18 @@ msgstr "Home path"
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "De windows gebruikers manager laat maximum 8 clients toe!"
 
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "Er is een ongedefinieerd SambaSID geselecteerd. Repareer dit probleem a.u.b. handmatig!"
+
 #: personal/samba/class_sambaAccount.inc:532
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
@@ -654,6 +402,258 @@ msgid ""
 "group when activating the Samba tab of a user"
 msgstr ""
 
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Samba groep type"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Samba groep"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Windows beheerders"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Windows gebruikers"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Windows gasten"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Configuratie fout"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr "Kan de goep SID niet vinden in je configuratie!"
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Speciale groep (%d)"
+
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr ""
+
+#: admin/samba/class_sambaDomainManagement.inc:36
+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_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
+msgstr "Domein naam"
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
+msgstr "SID"
+
+#: 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 "Minimum paswoord leeftijd"
+
+#: 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 "Maximum paswoord leeftijd"
+
+#: 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 "Lockout tijd"
+
+#: 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 "Weiger machine paswoord wijziging"
+
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Windows werkstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Windows werkstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Naam"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Omschrijving"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Plaats"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr ""
+
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
 msgstr "Specificeer de uren waarop de gebruiker in mag loggen"
diff --git a/samba/locale/pl/fusiondirectory.po b/samba/locale/pl/fusiondirectory.po
index 55bc928dd9..5f4568f8b9 100644
--- a/samba/locale/pl/fusiondirectory.po
+++ b/samba/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,288 +17,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: 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_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Domena"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Typ grupy Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Grupa Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Administratorzy domeny"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Użytkownicy domeny"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Goście domeny"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Błąd konfiguracji"
-
-#: 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 "Specjalna grupa (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr ""
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-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_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Właściwości"
-
-#: 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/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Stacja Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Stacja robocza Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Opis"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Lokalizacja"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -309,6 +27,12 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -338,6 +62,18 @@ msgstr ""
 msgid "UNC path for the home drive"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Domena"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Ścieżka do skryptu"
@@ -456,202 +192,466 @@ msgstr "input tak, notify nie"
 msgid "input off, notify on"
 msgstr "input nie, notify tak"
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
-msgstr "input nie, notify nie"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
+msgstr "input nie, notify nie"
+
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
+msgstr "Przy rozłączeniu lub timeoucie"
+
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
+msgstr "rozłącz"
+
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
+msgstr "resetuj"
+
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
+msgstr "Połącz jeśli rozłączono"
+
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
+msgstr "z każdego klienta"
+
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
+msgstr "tylko z poprzedniego klienta"
+
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
+msgstr "Opcje dostępu"
+
+#: 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 "Logowanie z klienta windows nie wymaga hasła"
+
+#: 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 "Zablokuj konto samba"
+
+#: 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 "Zaufanie systemowe"
+
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
+msgstr "Zezwól na połączenia tylko z tych stacji"
+
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
+msgstr "Samba SID"
+
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Typ grupy Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Grupa Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Administratorzy domeny"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Użytkownicy domeny"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Goście domeny"
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
-msgstr "Przy rozłączeniu lub timeoucie"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Błąd konfiguracji"
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
-msgstr "rozłącz"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Specjalna grupa (%d)"
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
-msgstr "resetuj"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
-msgstr "Połącz jeśli rozłączono"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
-msgstr "z każdego klienta"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
-msgstr "tylko z poprzedniego klienta"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
-msgstr "Opcje dostępu"
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Właściwości"
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
-msgstr "Logowanie z klienta windows nie wymaga hasła"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
-msgstr "Zablokuj konto samba"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
-msgstr "Zaufanie systemowe"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
-msgstr "Zezwól na połączenia tylko z tych stacji"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
-msgstr "Samba SID"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
+msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Stacja Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Stacja robocza Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "ImiÄ™"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Opis"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Lokalizacja"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/pt/fusiondirectory.po b/samba/locale/pt/fusiondirectory.po
index 316bd61365..3bf878d2aa 100644
--- a/samba/locale/pt/fusiondirectory.po
+++ b/samba/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
 msgid "Samba"
 msgstr "Samba"
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
-msgstr ""
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
+msgstr "Configurações samba"
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Grupo samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Administradores do domínio"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Usuários do domínio"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Convidados do domínio"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Erro de configuração"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Atenção"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Propriedades"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
+msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
+msgstr "desabilitado"
+
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nome"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Descrição"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Localização"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
-msgstr "Configurações samba"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
+msgstr "Sistema de confiança"
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Atenção"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Grupo samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Administradores do domínio"
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Usuários do domínio"
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Convidados do domínio"
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
-msgstr "desabilitado"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Erro de configuração"
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
-msgstr ""
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Propriedades"
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
-msgstr "Sistema de confiança"
-
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Nome"
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Descrição"
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Localização"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/pt_BR/fusiondirectory.po b/samba/locale/pt_BR/fusiondirectory.po
index fce866afea..c30658e688 100644
--- a/samba/locale/pt_BR/fusiondirectory.po
+++ b/samba/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,288 +17,6 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: 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_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Domínio"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Tipo de grupo Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Grupo Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Administradores do domínio"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Usuários do domínio"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Convidados do domínio"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Erro de configuração"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
-msgstr "Não foi possível encontrar grupo SID na sua configuração!"
-
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Grupo especial (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Detectado Samba SID indefinido. Favor corrigir este problema manualmente!"
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr ""
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-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_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Propriedades"
-
-#: 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/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Workstation do Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "O nome do Winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Descrição"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Uma pequena descrição do winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Nome do dominio Samba"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Localização"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "A localização do winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Configurações de rede"
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -309,6 +27,12 @@ msgstr "Sua instalação do PHP não possui mhash() ou a função de hash. Incap
 msgid "Samba Munged Dial"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -338,6 +62,18 @@ msgstr "Pacote do diretório principal"
 msgid "UNC path for the home drive"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Domínio"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Nome do dominio Samba"
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Local do script"
@@ -576,6 +312,18 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Aviso"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "Detectado Samba SID indefinido. Favor corrigir este problema manualmente!"
+
 #: personal/samba/class_sambaAccount.inc:532
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
@@ -654,6 +402,258 @@ msgid ""
 "group when activating the Samba tab of a user"
 msgstr ""
 
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Tipo de grupo Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Grupo Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Administradores do domínio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Usuários do domínio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Convidados do domínio"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Erro de configuração"
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr "Não foi possível encontrar grupo SID na sua configuração!"
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
+
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr ""
+
+#: admin/samba/class_sambaDomainManagement.inc:36
+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_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Propriedades"
+
+#: 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/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Winstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Workstation do Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
+msgstr "O nome do Winstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Nome"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Descrição"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
+msgstr "Uma pequena descrição do winstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Localização"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
+msgstr "A localização do winstation"
+
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
+msgstr "Configurações de rede"
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr ""
+
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
 msgstr ""
diff --git a/samba/locale/ru/fusiondirectory.po b/samba/locale/ru/fusiondirectory.po
index a3e2e90776..fc4d59185b 100644
--- a/samba/locale/ru/fusiondirectory.po
+++ b/samba/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -19,288 +19,6 @@ 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/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: 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_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Домен"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
-msgstr "Домен Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
-msgstr ""
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
-msgstr "Тип группы"
-
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr " Тип Samba групп"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Группа Samba"
-
-#: 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 "Не могу найти SID группы в вашей конфигурации!"
-
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Специальная группа (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr "Домены Samba"
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
-msgstr "Управление доменами Samba"
-
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
-msgstr "Домен Samba"
-
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
-msgstr "Настройки домена Samba"
-
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-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 "SID"
-
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
-msgstr "SID этого домена"
-
-#: 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 "Следующий RID"
-
-#: 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 "Минимальная длина пароля (по умолчанию: 5)"
-
-#: 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/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Рабочая станция Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr "Информация об рабочей станции Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Рабочая станция Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "Название рабочей станции Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Фамилия"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Описание"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Краткое описание рабочей станции Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Имя домена Samba"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Местоположение"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "Расположение рабочей станции Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Сетевые настройки"
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -311,6 +29,12 @@ msgstr "В вашей PHP установки нету ни mhash() ни хэш-
 msgid "Samba Munged Dial"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -340,6 +64,18 @@ msgstr "Путь к домашней директории"
 msgid "UNC path for the home drive"
 msgstr "UNC путь к домашнему диску"
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Домен"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Имя домена Samba"
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "Путь к сценариям"
@@ -578,6 +314,18 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:532
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
@@ -656,6 +404,258 @@ msgid ""
 "group when activating the Samba tab of a user"
 msgstr ""
 
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr "Домен Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr "Тип группы"
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr " Тип Samba групп"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Группа Samba"
+
+#: 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 "Не могу найти SID группы в вашей конфигурации!"
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Специальная группа (%d)"
+
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr "Домены Samba"
+
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
+msgstr "Управление доменами Samba"
+
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
+msgstr "Домен Samba"
+
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
+msgstr "Настройки домена Samba"
+
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+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 "SID"
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
+msgstr "SID этого домена"
+
+#: 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 "Следующий RID"
+
+#: 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 "Минимальная длина пароля (по умолчанию: 5)"
+
+#: 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/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Рабочая станция Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
+msgstr "Информация об рабочей станции Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Рабочая станция Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
+msgstr "Название рабочей станции Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Фамилия"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Описание"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
+msgstr "Краткое описание рабочей станции Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Местоположение"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
+msgstr "Расположение рабочей станции Windows"
+
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
+msgstr "Сетевые настройки"
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr ""
+
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
 msgstr "Укажите время, когда этому пользователю разрешен вход."
diff --git a/samba/locale/ru@petr1708/fusiondirectory.po b/samba/locale/ru@petr1708/fusiondirectory.po
index 62c9b3e901..2a9ff0d1cb 100644
--- a/samba/locale/ru@petr1708/fusiondirectory.po
+++ b/samba/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,641 +17,641 @@ 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/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/sv/fusiondirectory.po b/samba/locale/sv/fusiondirectory.po
index 99108c40a2..bd804c262e 100644
--- a/samba/locale/sv/fusiondirectory.po
+++ b/samba/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr "Din PHP-installation har inte mhash() eller hash-funktionen. Kan inte göra MD4-hashar."
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
 msgid "Samba"
 msgstr "Samba"
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
-msgstr "Domän"
-
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Samba-grupptyp"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Samba-grupp"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Domänadministratörer"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Domänanvändare"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
+msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Domängäster"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
+msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Konfigurationsfel"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "Domän"
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
-msgstr "Kan inte hitta grupp-SID i konfigurationen"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Samba domännamn"
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Specialgrupp (%d)"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
+msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Varning"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
+msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Egenskaper"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
+msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
-msgstr "Domännamn"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
+msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
+msgstr "avaktiverad"
+
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Namn"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Beskrivning"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Samba domännamn"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Plats"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
-msgstr "Din PHP-installation har inte mhash() eller hash-funktionen. Kan inte göra MD4-hashar."
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
+msgstr "System trust"
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
-msgstr ""
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
+msgstr "Tillåt användaren att endast logga in på denna lista av hosts"
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
-msgstr ""
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Varning"
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Samba-grupptyp"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Samba-grupp"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Domänadministratörer"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Domänanvändare"
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Domängäster"
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Konfigurationsfel"
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr "Kan inte hitta grupp-SID i konfigurationen"
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
-msgstr "avaktiverad"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Specialgrupp (%d)"
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
-msgstr ""
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Egenskaper"
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
-msgstr ""
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
+msgstr "Domännamn"
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
-msgstr "System trust"
-
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Tillåt användaren att endast logga in på denna lista av hosts"
-
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Winstation"
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Namn"
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Beskrivning"
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Plats"
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/ug/fusiondirectory.po b/samba/locale/ug/fusiondirectory.po
index baa623f10f..e2e91cd78d 100644
--- a/samba/locale/ug/fusiondirectory.po
+++ b/samba/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/vi_VN/fusiondirectory.po b/samba/locale/vi_VN/fusiondirectory.po
index 9cef2d7145..468f128da6 100644
--- a/samba/locale/vi_VN/fusiondirectory.po
+++ b/samba/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,641 +17,641 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
 msgid "Samba"
 msgstr "Samba"
 
-#: admin/groups/samba/class_sambaGroup.inc:30
-msgid "Samba group settings"
-msgstr ""
+#: personal/samba/class_sambaAccount.inc:159
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
+msgstr "Thiết lập Samba"
 
-#: admin/groups/samba/class_sambaGroup.inc:42
-#: admin/groups/samba/class_sambaGroup.inc:45
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Domain"
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:45
-msgid "Samba domain"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:49
-msgid "Samba informations"
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Group type"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
 msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:56
-msgid "Samba group type"
-msgstr "Loại nhóm Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Samba group"
-msgstr "Nhóm Samba"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain admins"
-msgstr "Admin miền"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain users"
-msgstr "Người dùng miền"
-
-#: admin/groups/samba/class_sambaGroup.inc:60
-#: admin/groups/samba/class_sambaGroup.inc:120
-msgid "Domain guests"
-msgstr "Khách miền"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Configuration error"
-msgstr "Lỗi cấu hình"
-
-#: admin/groups/samba/class_sambaGroup.inc:106
-msgid "Cannot find group SID in your configuration!"
-msgstr "Không thể tìm được nhóm SID trong cấu hình của bạn!"
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
+msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:120
-#, php-format
-msgid "Special group (%d)"
-msgstr "Nhóm đặc biệt (%d)"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr ""
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "Cảnh báo"
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr "Tên miền Samba"
 
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:36
-msgid "Samba domain management"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
-#: admin/samba/class_sambaDomain.inc:34
-msgid "Samba Domain"
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:35
-msgid "Samba domain settings"
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
-msgid "Properties"
-msgstr "Properties"
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
+msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Domain name"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:54
-msgid "Name of this domain"
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:58
-msgid "SID of this domain"
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Rid base"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:62
-msgid "Algorithmic rid base"
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:66
-msgid "Minimum password age"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:67
-msgid ""
-"Minimum password age, in seconds (default: 0 => allow immediate password "
-"change)"
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:72
-msgid "Maximum password age"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:73
-msgid ""
-"Maximum password age, in seconds (default: -1 => never expire passwords)"
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:78
-msgid "Next RID"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:79
-msgid "Next NT rid to give out for anything"
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:83
-msgid "Next group RID"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:84
-msgid "Next NT rid to give out for groups"
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:88
-msgid "Next user RID"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:89
-msgid "Next NT rid to give our for users"
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:93
-msgid "Minimum password length"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:94
-msgid "Minimal password length (default: 5)"
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:98
-msgid "Password history length"
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:99
-msgid "Length of Password History Entries (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
+msgstr "Đã vô hiệu"
+
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:103
-msgid "Logon to change password"
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:104
-msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:108
-msgid "Lockout duration"
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:109
-msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:113
-msgid "Lockout observation window"
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:114
-msgid "Reset time after lockout in minutes (default: 30)"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:118
-msgid "Lockout threshold"
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:119
-msgid "Lockout users after bad logon attempts (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:123
-msgid "Force logoff"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:124
-msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:128
-msgid "Refuse machine password change"
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
 msgstr ""
 
-#: admin/samba/class_sambaDomain.inc:129
-msgid "Allow Machine Password changes (default: 0 => off)"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
 msgstr ""
 
-#: admin/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Tên"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Mô tả"
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr "Tên miền Samba"
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Vị trí"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
+msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
 msgstr ""
 
-#: include/class_smbHash.inc:356
-msgid ""
-"Your PHP install does not have the mhash() nor the hash function. Cannot do "
-"MD4 hashes."
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:31
-msgid "Samba Munged Dial"
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:159
-#: config/samba/class_sambaPluginConfig.inc:41
-msgid "Samba settings"
-msgstr "Thiết lập Samba"
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
+msgstr "Ủy thác hệ thống"
 
-#: personal/samba/class_sambaAccount.inc:183
-msgid "Samba profile"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Home directory drive"
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:189
-#: personal/samba/class_sambaAccount.inc:222
-msgid "Letter for the home drive"
+#: personal/samba/class_sambaAccount.inc:480
+msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "Home directory path"
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:194
-#: personal/samba/class_sambaAccount.inc:227
-msgid "UNC path for the home drive"
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Script path"
-msgstr ""
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "Cảnh báo"
 
-#: personal/samba/class_sambaAccount.inc:203
-msgid "Login script path"
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "Profile path"
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:207
-#: personal/samba/class_sambaAccount.inc:232
-msgid "UNC profile path"
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:214
-msgid "Terminal server"
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:218
-msgid "Allow login on terminal server"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client config"
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:237
-msgid "Inherit client configuration"
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Initial progam"
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:241
-msgid "Program to start after connecting"
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
+msgstr "SID cá»§a Samba"
+
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Working directory"
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:245
-msgid "Basic working directory"
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Connection timeout"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:249
-msgid "Timeout when connecting to terminal server"
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Disconnection timeout"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:254
-msgid "Timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:259
-msgid "Idle timeout before disconnecting from terminal server"
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Connect client drives at logon"
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:264
-msgid "Drive to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Connect client printers at logon"
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:268
-msgid "Printers to connect after login"
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default to main client printer"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr "Loại nhóm Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr "Nhóm Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr "Admin miền"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr "Người dùng miền"
 
-#: personal/samba/class_sambaAccount.inc:272
-msgid "Default printer for this client"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr "Khách miền"
 
-#: personal/samba/class_sambaAccount.inc:276
-msgid "Shadowing"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr "Lỗi cấu hình"
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "disabled"
-msgstr "Đã vô hiệu"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr "Không thể tìm được nhóm SID trong cấu hình của bạn!"
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify on"
-msgstr ""
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "Nhóm đặc biệt (%d)"
 
-#: personal/samba/class_sambaAccount.inc:279
-msgid "input on, notify off"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, notify on"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
-msgstr ""
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "Properties"
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
-msgstr "Ủy thác hệ thống"
-
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
-msgstr "SID cá»§a Samba"
-
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "Tên"
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
-msgstr ""
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "Mô tả"
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "Vị trí"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/samba/locale/zh/fusiondirectory.po b/samba/locale/zh/fusiondirectory.po
index 43c809b55d..1fc33186c1 100644
--- a/samba/locale/zh/fusiondirectory.po
+++ b/samba/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-27 16:12+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,288 +17,6 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/groups/samba/class_sambaGroup.inc:29
-#: personal/samba/class_sambaAccount.inc:158
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
-#: 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_winstationGeneric.inc:85
-#: 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 informations"
-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 "Samba 组"
-
-#: 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 "域名 guests"
-
-#: 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 "特殊组 (%d)"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-msgid "Warning"
-msgstr "警告"
-
-#: admin/groups/samba/class_sambaGroup.inc:135
-#: personal/samba/class_sambaAccount.inc:505
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: admin/samba/class_sambaDomainManagement.inc:35
-msgid "Samba domains"
-msgstr ""
-
-#: admin/samba/class_sambaDomainManagement.inc:36
-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_winstationGeneric.inc:61
-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/systems/samba/class_argonautEventSambaShares.inc:27
-msgid "Update Samba Shares"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Windows 工作站"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
-msgid "Windows workstation information"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Windows 工作站"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "名称"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "描述"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:85
-#: personal/samba/class_sambaAccount.inc:199
-msgid "Samba domain name"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "位置"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: include/class_smbHash.inc:356
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
@@ -309,6 +27,12 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:158
+#: config/samba/class_sambaPluginConfig.inc:28
+#: admin/groups/samba/class_sambaGroup.inc:29
+msgid "Samba"
+msgstr "Samba"
+
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -338,6 +62,18 @@ msgstr ""
 msgid "UNC path for the home drive"
 msgstr ""
 
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Domain"
+msgstr "域"
+
+#: personal/samba/class_sambaAccount.inc:199
+#: admin/systems/samba/class_winstationGeneric.inc:85
+msgid "Samba domain name"
+msgstr ""
+
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
 msgstr "脚本路径"
@@ -456,202 +192,466 @@ msgstr "输入打开,通知关闭"
 msgid "input off, notify on"
 msgstr "输入关闭,通知打开"
 
-#: personal/samba/class_sambaAccount.inc:280
-msgid "input off, nofify off"
-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 "从 Windows 客户端登录不需要口令"
+
+#: 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 "锁定 samba 账号"
+
+#: 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 "Samba 登录次数"
+
+#: 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:480
+msgid "Home drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:483
+msgid "Home path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:488
+msgid "The windows user manager allows eight clients at maximum!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:505
+#: personal/samba/class_sambaAccount.inc:531
+#: personal/samba/class_sambaAccount.inc:552
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Warning"
+msgstr "警告"
+
+#: personal/samba/class_sambaAccount.inc:505
+#: admin/groups/samba/class_sambaGroup.inc:135
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:532
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:553
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba machine account RDN"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "The location where FusionDirectory looks for new samba workstations."
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:49
+msgid "Samba ID mapping"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:50
+msgid ""
+"Maintain sambaIdmapEntry objects. Depending on your setup this can "
+"drastically improve the windows login performance."
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:54
+msgid "Samba SID"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:55
+msgid ""
+"A samba SID if not available inside of the LDAP though samba schema. You can"
+" retrieve the current sid by net getlocalsid."
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:60
+msgid "Samba rid base"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid ""
+"The base id to add to ordinary sid calculations - if not available inside of"
+" the LDAP though samba schema."
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Expiration date synchronisaton"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:66
+msgid "Synchronisaton the expiration date with the POSIX one?"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Generate sambaLMPassword"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:72
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid "Activate primary group warning"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:76
+msgid ""
+"Issue a warning if POSIX primary group cannot be converted to Samba primary "
+"group when activating the Samba tab of a user"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba informations"
+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 "Samba 组"
+
+#: 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 "域名 guests"
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "On broken or timed out"
-msgstr "断开或超时"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:283
-msgid "What happen if disconnected or timeout"
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "disconnect"
-msgstr "æ–­å¼€"
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr "特殊组 (%d)"
 
-#: personal/samba/class_sambaAccount.inc:286
-msgid "reset"
-msgstr "重置"
+#: admin/samba/class_sambaDomainManagement.inc:35
+msgid "Samba domains"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:289
-msgid "Reconnect if disconnected"
-msgstr "断线重连"
+#: admin/samba/class_sambaDomainManagement.inc:36
+msgid "Samba domain management"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from any client"
-msgstr "从任意客户"
+#: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
+#: admin/samba/class_sambaDomain.inc:34
+msgid "Samba Domain"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:292
-msgid "from previous client only"
-msgstr "只从上一个客户"
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:304
-msgid "Access options"
-msgstr "访问选项"
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_winstationGeneric.inc:61
+msgid "Properties"
+msgstr "属性"
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Enforce password change"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:308
-msgid "Force the user to change his password"
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password never expire"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:313
-msgid "The password will never expire"
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from windows client requires no password"
-msgstr "从 Windows 客户端登录不需要口令"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:318
-msgid "Login from a client without a password"
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock samba account"
-msgstr "锁定 samba 账号"
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:323
-msgid "Lock the account"
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Cannot change password"
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:328
-msgid "Not allowed to change password"
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "Account expiration"
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:332
-msgid "When does the account expire"
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "Samba logon times"
-msgstr "Samba 登录次数"
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:340
-msgid "What is the allowed time to connect"
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:341
-msgid "Edit settings"
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
-msgid "System trust"
-msgstr "信赖的系统"
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Allow connection from these workstations only"
-msgstr "只允许从这些工作站建立连接"
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
+msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:363
-msgid "Only allow this user to connect to this list of hosts"
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
-msgid "Home drive"
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
-msgid "Home path"
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
-msgid "The windows user manager allows eight clients at maximum!"
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
-msgid ""
-"Cannot convert primary group to samba group: group cannot be identified!"
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
-msgid ""
-"Cannot convert primary group to samba group: group samba tab is disabled!"
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:29
-msgid "Samba plugin configuration"
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:49
-msgid "Samba ID mapping"
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
-msgid ""
-"Maintain sambaIdmapEntry objects. Depending on your setup this can "
-"drastically improve the windows login performance."
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
-msgid "Samba SID"
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
-msgid ""
-"A samba SID if not available inside of the LDAP though samba schema. You can"
-" retrieve the current sid by net getlocalsid."
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
-msgid "Samba rid base"
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
-msgid ""
-"The base id to add to ordinary sid calculations - if not available inside of"
-" the LDAP though samba schema."
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Expiration date synchronisaton"
+#: admin/systems/samba/class_winstationGeneric.inc:37
+msgid "Winstation"
+msgstr "Windows 工作站"
+
+#: admin/systems/samba/class_winstationGeneric.inc:38
+msgid "Windows workstation information"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
-msgid "Synchronisaton the expiration date with the POSIX one?"
+#: admin/systems/samba/class_winstationGeneric.inc:42
+#: admin/systems/samba/class_winstationGeneric.inc:43
+msgid "Windows workstation"
+msgstr "Windows 工作站"
+
+#: admin/systems/samba/class_winstationGeneric.inc:70
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "The name of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Generate sambaLMPassword"
+#: admin/systems/samba/class_winstationGeneric.inc:74
+msgid "Name"
+msgstr "名称"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "Description"
+msgstr "描述"
+
+#: admin/systems/samba/class_winstationGeneric.inc:81
+msgid "A short description of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
-msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "Location"
+msgstr "位置"
+
+#: admin/systems/samba/class_winstationGeneric.inc:89
+msgid "The location of the winstation"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid "Activate primary group warning"
+#: admin/systems/samba/class_winstationGeneric.inc:96
+msgid "Network settings"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
-msgid ""
-"Issue a warning if POSIX primary group cannot be converted to Samba primary "
-"group when activating the Samba tab of a user"
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
diff --git a/sogo/locale/ar/fusiondirectory.po b/sogo/locale/ar/fusiondirectory.po
index 083fb903cc..a3f2accec4 100644
--- a/sogo/locale/ar/fusiondirectory.po
+++ b/sogo/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/ca/fusiondirectory.po b/sogo/locale/ca/fusiondirectory.po
index 6a11d34081..faf82fbea9 100644
--- a/sogo/locale/ca/fusiondirectory.po
+++ b/sogo/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/cs_CZ/fusiondirectory.po b/sogo/locale/cs_CZ/fusiondirectory.po
index cb6d08fdc7..644aeb78d1 100644
--- a/sogo/locale/cs_CZ/fusiondirectory.po
+++ b/sogo/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr "Nastavení SOGo"
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr "Nastavení zásuvného modulu sogo pro FusionDirectory"
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr "SOGo"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr "Relativní rozlišený název SOGo"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr "Větev, ve které budou uloženy objekty SOGo"
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr "Druh"
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr "SOGo"
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr "Správa SOGo"
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr "Nastavení SOGo"
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr "Nastavení zásuvného modulu sogo pro FusionDirectory"
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr "Relativní rozlišený název SOGo"
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr "Větev, ve které budou uloženy objekty SOGo"
diff --git a/sogo/locale/de/fusiondirectory.po b/sogo/locale/de/fusiondirectory.po
index 83327932e1..23f5d585aa 100644
--- a/sogo/locale/de/fusiondirectory.po
+++ b/sogo/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,27 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr "SOGo-Konfiguration"
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr "SOGo"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -47,27 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr "Art"
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr "SOGo"
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr "SOGo-Verwaltung"
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr "SOGo-Konfiguration"
-
-#: 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/el_GR/fusiondirectory.po b/sogo/locale/el_GR/fusiondirectory.po
index 9ec34d521c..387cdeadc3 100644
--- a/sogo/locale/el_GR/fusiondirectory.po
+++ b/sogo/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,27 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr "Ρύθμιση SOGo"
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory sogo"
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr "SOGo"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr "SOGo RDN"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr "Κλάδος στον οποίο θα αποθηκεύονται τα αντικείμενα SOGo"
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -47,27 +68,6 @@ msgstr "Multiplebookings"
 msgid "Kind"
 msgstr "Είδος"
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr "SOGo"
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr "Διαχείριση SOGo"
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr "Ρύθμιση SOGo"
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory sogo"
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr "SOGo RDN"
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr "Κλάδος στον οποίο θα αποθηκεύονται τα αντικείμενα SOGo"
diff --git a/sogo/locale/es/fusiondirectory.po b/sogo/locale/es/fusiondirectory.po
index 43d008c275..727ee5d651 100644
--- a/sogo/locale/es/fusiondirectory.po
+++ b/sogo/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/es_CO/fusiondirectory.po b/sogo/locale/es_CO/fusiondirectory.po
index e74683cd20..76e605b9a7 100644
--- a/sogo/locale/es_CO/fusiondirectory.po
+++ b/sogo/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/es_VE/fusiondirectory.po b/sogo/locale/es_VE/fusiondirectory.po
index c0a58a49cb..5816a30fe7 100644
--- a/sogo/locale/es_VE/fusiondirectory.po
+++ b/sogo/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/fa_IR/fusiondirectory.po b/sogo/locale/fa_IR/fusiondirectory.po
index f600799198..bce9e6b440 100644
--- a/sogo/locale/fa_IR/fusiondirectory.po
+++ b/sogo/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/fi_FI/fusiondirectory.po b/sogo/locale/fi_FI/fusiondirectory.po
index a20a266aad..1952c37696 100644
--- a/sogo/locale/fi_FI/fusiondirectory.po
+++ b/sogo/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/fr/fusiondirectory.po b/sogo/locale/fr/fusiondirectory.po
index d0bca5547d..b17deddfc8 100644
--- a/sogo/locale/fr/fusiondirectory.po
+++ b/sogo/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -19,6 +19,27 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr "Configuration de SOGo"
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr "Configuration du plugin SOGo"
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr "SOGo"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr "Branche SOGo"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr "Branche où les objets SOGo seront stockés"
+
 #: 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"
@@ -48,27 +69,6 @@ msgstr "Réservations multiples"
 msgid "Kind"
 msgstr "Type"
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr "SOGo"
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr "Gestion SOGo"
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr "Configuration de SOGo"
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr "Configuration du plugin SOGo"
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr "Branche SOGo"
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr "Branche où les objets SOGo seront stockés"
diff --git a/sogo/locale/hu_HU/fusiondirectory.po b/sogo/locale/hu_HU/fusiondirectory.po
index e4e339ff84..4028bb794d 100644
--- a/sogo/locale/hu_HU/fusiondirectory.po
+++ b/sogo/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/id/fusiondirectory.po b/sogo/locale/id/fusiondirectory.po
index fe0a1b0a72..3eef7aa78e 100644
--- a/sogo/locale/id/fusiondirectory.po
+++ b/sogo/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/it_IT/fusiondirectory.po b/sogo/locale/it_IT/fusiondirectory.po
index e783c039cb..893f1850f9 100644
--- a/sogo/locale/it_IT/fusiondirectory.po
+++ b/sogo/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:28+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,6 +19,27 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr "Configurazione di SOGo"
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr "Configurazione del plugin sogo di FusionDirectory"
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr "SOGo"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr "RDN SOGo"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr "Ramo in cui gli oggetti SOGo saranno immagazzinati "
+
 #: 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"
@@ -48,27 +69,6 @@ msgstr "Multiplebookings"
 msgid "Kind"
 msgstr "Tipo"
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr "SOGo"
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr "Gestione di SOGo"
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr "Configurazione di SOGo"
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr "Configurazione del plugin sogo di FusionDirectory"
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr "RDN SOGo"
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr "Ramo in cui gli oggetti SOGo saranno immagazzinati "
diff --git a/sogo/locale/lv/fusiondirectory.po b/sogo/locale/lv/fusiondirectory.po
index ed03b62597..c62a6ca826 100644
--- a/sogo/locale/lv/fusiondirectory.po
+++ b/sogo/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/nb/fusiondirectory.po b/sogo/locale/nb/fusiondirectory.po
index 70b80bed0d..b001d901c7 100644
--- a/sogo/locale/nb/fusiondirectory.po
+++ b/sogo/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/nl/fusiondirectory.po b/sogo/locale/nl/fusiondirectory.po
index bcfa3d19c6..c3242d74b8 100644
--- a/sogo/locale/nl/fusiondirectory.po
+++ b/sogo/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/pl/fusiondirectory.po b/sogo/locale/pl/fusiondirectory.po
index 24807a3222..7e63b100cb 100644
--- a/sogo/locale/pl/fusiondirectory.po
+++ b/sogo/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/pt/fusiondirectory.po b/sogo/locale/pt/fusiondirectory.po
index 159b595c5b..b50d37a9b9 100644
--- a/sogo/locale/pt/fusiondirectory.po
+++ b/sogo/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/pt_BR/fusiondirectory.po b/sogo/locale/pt_BR/fusiondirectory.po
index 35929e9ffb..c44cd2f4f3 100644
--- a/sogo/locale/pt_BR/fusiondirectory.po
+++ b/sogo/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr "Configuração de SOGo"
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr "Configuração do plugin FusionDirectory sogo"
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr "SOGo"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr "SOGo RDN"
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr "Multiplebookings"
 msgid "Kind"
 msgstr "Tipo"
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr "SOGo"
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr "Gerenciar SOGo"
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr "Configuração de SOGo"
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr "Configuração do plugin FusionDirectory sogo"
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr "SOGo RDN"
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/ru/fusiondirectory.po b/sogo/locale/ru/fusiondirectory.po
index be42f88c06..09876ef57e 100644
--- a/sogo/locale/ru/fusiondirectory.po
+++ b/sogo/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/ru@petr1708/fusiondirectory.po b/sogo/locale/ru@petr1708/fusiondirectory.po
index 387e9ce344..9dc600e779 100644
--- a/sogo/locale/ru@petr1708/fusiondirectory.po
+++ b/sogo/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/sv/fusiondirectory.po b/sogo/locale/sv/fusiondirectory.po
index b3c2e19322..8b4c840f4f 100644
--- a/sogo/locale/sv/fusiondirectory.po
+++ b/sogo/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/ug/fusiondirectory.po b/sogo/locale/ug/fusiondirectory.po
index ce9ecae29e..7104f25743 100644
--- a/sogo/locale/ug/fusiondirectory.po
+++ b/sogo/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/vi_VN/fusiondirectory.po b/sogo/locale/vi_VN/fusiondirectory.po
index 9f8acf4994..88c05c5413 100644
--- a/sogo/locale/vi_VN/fusiondirectory.po
+++ b/sogo/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/sogo/locale/zh/fusiondirectory.po b/sogo/locale/zh/fusiondirectory.po
index 4a58295d65..4a3765c2e5 100644
--- a/sogo/locale/zh/fusiondirectory.po
+++ b/sogo/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:34
+#: admin/sogo/class_sogoManagement.inc:39
+msgid "SOGo"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
+
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
 msgid "SOGo resource"
@@ -46,27 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:34
-#: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
-msgid "SOGo"
-msgstr ""
-
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
 msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:28
-msgid "SOGo configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:29
-msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "SOGo RDN"
-msgstr ""
-
-#: config/sogo/class_sogoConfig.inc:45
-msgid "Branch in which SOGo objects will be stored"
-msgstr ""
diff --git a/spamassassin/locale/ar/fusiondirectory.po b/spamassassin/locale/ar/fusiondirectory.po
index a967b3a358..b1f099d655 100644
--- a/spamassassin/locale/ar/fusiondirectory.po
+++ b/spamassassin/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: personal/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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "الإسم"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/ca/fusiondirectory.po b/spamassassin/locale/ca/fusiondirectory.po
index 5113f8afba..3daa3e03fd 100644
--- a/spamassassin/locale/ca/fusiondirectory.po
+++ b/spamassassin/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Nom"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/cs_CZ/fusiondirectory.po b/spamassassin/locale/cs_CZ/fusiondirectory.po
index 307a5e8aaf..04ae11f557 100644
--- a/spamassassin/locale/cs_CZ/fusiondirectory.po
+++ b/spamassassin/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Název"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Rule"
 msgstr "Pravidlo"
-
-#: 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/de/fusiondirectory.po b/spamassassin/locale/de/fusiondirectory.po
index 0a35ef9c80..4c80295fde 100644
--- a/spamassassin/locale/de/fusiondirectory.po
+++ b/spamassassin/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Name"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Rule"
 msgstr "Regel"
-
-#: 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/el_GR/fusiondirectory.po b/spamassassin/locale/el_GR/fusiondirectory.po
index 1ca6689fd5..bbba4d6d66 100644
--- a/spamassassin/locale/el_GR/fusiondirectory.po
+++ b/spamassassin/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Όνομα"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/es/fusiondirectory.po b/spamassassin/locale/es/fusiondirectory.po
index 56d2d55fad..8b9945c965 100644
--- a/spamassassin/locale/es/fusiondirectory.po
+++ b/spamassassin/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Nombre"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Rule"
 msgstr "Papel desempeñado"
-
-#: 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/es_CO/fusiondirectory.po b/spamassassin/locale/es_CO/fusiondirectory.po
index 88f3487759..e3766e0f83 100644
--- a/spamassassin/locale/es_CO/fusiondirectory.po
+++ b/spamassassin/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Nombre"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/es_VE/fusiondirectory.po b/spamassassin/locale/es_VE/fusiondirectory.po
index 2d64dc685d..271164bb34 100644
--- a/spamassassin/locale/es_VE/fusiondirectory.po
+++ b/spamassassin/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Nombre"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Rule"
 msgstr "Papel desempeñado"
-
-#: 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/fa_IR/fusiondirectory.po b/spamassassin/locale/fa_IR/fusiondirectory.po
index 0ca0385f83..80b86fecee 100644
--- a/spamassassin/locale/fa_IR/fusiondirectory.po
+++ b/spamassassin/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr ""
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/fi_FI/fusiondirectory.po b/spamassassin/locale/fi_FI/fusiondirectory.po
index 5a0d75499d..da0cde3e39 100644
--- a/spamassassin/locale/fi_FI/fusiondirectory.po
+++ b/spamassassin/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-13 13:29+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Nimi"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/fr/fusiondirectory.po b/spamassassin/locale/fr/fusiondirectory.po
index a41089ce60..793f1e48c9 100644
--- a/spamassassin/locale/fr/fusiondirectory.po
+++ b/spamassassin/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:26+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,6 +18,42 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: personal/spamassassin/class_spamAssassinAccount.inc:31
+msgid "Spam rules"
+msgstr "règles de courrier indésirable"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:38
+msgid "SpamAssassin user preferences settings"
+msgstr "Préférences utilisateur SpamAssassin "
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:42
+msgid "Directive"
+msgstr "Directive"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:42
+msgid "The name of a SpamAssassin configuration directive"
+msgstr "Le nom d'une directive de configuration SpamAssassin"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:47
+msgid "Value"
+msgstr "Valeur"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:47
+msgid "The value for the directive"
+msgstr "La valeur de la directive"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:54
+msgid "SpamAssassin user rules"
+msgstr "règles utilisateur SpamAssassin"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:65
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:66
+msgid "Edit user's spam rules"
+msgstr "Éditer les règles courrier indésirable"
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -91,39 +127,3 @@ msgstr "Nom"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Rule"
 msgstr "Règle"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:31
-msgid "Spam rules"
-msgstr "règles de courrier indésirable"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:38
-msgid "SpamAssassin user preferences settings"
-msgstr "Préférences utilisateur SpamAssassin "
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:42
-msgid "Directive"
-msgstr "Directive"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:42
-msgid "The name of a SpamAssassin configuration directive"
-msgstr "Le nom d'une directive de configuration SpamAssassin"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:47
-msgid "Value"
-msgstr "Valeur"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:47
-msgid "The value for the directive"
-msgstr "La valeur de la directive"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:54
-msgid "SpamAssassin user rules"
-msgstr "règles utilisateur SpamAssassin"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:65
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:66
-msgid "Edit user's spam rules"
-msgstr "Éditer les règles courrier indésirable"
diff --git a/spamassassin/locale/hu_HU/fusiondirectory.po b/spamassassin/locale/hu_HU/fusiondirectory.po
index eb75442040..dec9220241 100644
--- a/spamassassin/locale/hu_HU/fusiondirectory.po
+++ b/spamassassin/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Név"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/id/fusiondirectory.po b/spamassassin/locale/id/fusiondirectory.po
index 46f598b8f2..a279b1435f 100644
--- a/spamassassin/locale/id/fusiondirectory.po
+++ b/spamassassin/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr ""
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/it_IT/fusiondirectory.po b/spamassassin/locale/it_IT/fusiondirectory.po
index 0fa37c0e94..d5fe65ffd8 100644
--- a/spamassassin/locale/it_IT/fusiondirectory.po
+++ b/spamassassin/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:28+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -18,6 +18,42 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: personal/spamassassin/class_spamAssassinAccount.inc:31
+msgid "Spam rules"
+msgstr "Regole dello spam"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:38
+msgid "SpamAssassin user preferences settings"
+msgstr "Impostazioni delle preferenze utente per SpamAssassin"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:42
+msgid "Directive"
+msgstr "Direttiva"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:42
+msgid "The name of a SpamAssassin configuration directive"
+msgstr "Il nome di una direttiva di configurazione di SpamAssassin"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:47
+msgid "Value"
+msgstr "Valore"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:47
+msgid "The value for the directive"
+msgstr "Il valore della direttiva"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:54
+msgid "SpamAssassin user rules"
+msgstr "Regole dell'utente di SpamAssassin"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:65
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:66
+msgid "Edit user's spam rules"
+msgstr "Modifica le regole dello spam per l'utente"
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -91,39 +127,3 @@ msgstr "Nome"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Rule"
 msgstr "Regola"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:31
-msgid "Spam rules"
-msgstr "Regole dello spam"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:38
-msgid "SpamAssassin user preferences settings"
-msgstr "Impostazioni delle preferenze utente per SpamAssassin"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:42
-msgid "Directive"
-msgstr "Direttiva"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:42
-msgid "The name of a SpamAssassin configuration directive"
-msgstr "Il nome di una direttiva di configurazione di SpamAssassin"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:47
-msgid "Value"
-msgstr "Valore"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:47
-msgid "The value for the directive"
-msgstr "Il valore della direttiva"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:54
-msgid "SpamAssassin user rules"
-msgstr "Regole dell'utente di SpamAssassin"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:65
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
-
-#: personal/spamassassin/class_spamAssassinAccount.inc:66
-msgid "Edit user's spam rules"
-msgstr "Modifica le regole dello spam per l'utente"
diff --git a/spamassassin/locale/lv/fusiondirectory.po b/spamassassin/locale/lv/fusiondirectory.po
index aac69281f2..ad445ec0c6 100644
--- a/spamassassin/locale/lv/fusiondirectory.po
+++ b/spamassassin/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Vārds "
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/nb/fusiondirectory.po b/spamassassin/locale/nb/fusiondirectory.po
index 5045b62228..6f1737dae1 100644
--- a/spamassassin/locale/nb/fusiondirectory.po
+++ b/spamassassin/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Navn"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/nl/fusiondirectory.po b/spamassassin/locale/nl/fusiondirectory.po
index 8466ed3822..f5626b84a2 100644
--- a/spamassassin/locale/nl/fusiondirectory.po
+++ b/spamassassin/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Naam"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Rule"
 msgstr "Regel"
-
-#: 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/pl/fusiondirectory.po b/spamassassin/locale/pl/fusiondirectory.po
index 2311ccfef8..a00cd83b8a 100644
--- a/spamassassin/locale/pl/fusiondirectory.po
+++ b/spamassassin/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: personal/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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "ImiÄ™"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/pt/fusiondirectory.po b/spamassassin/locale/pt/fusiondirectory.po
index 5c889cf7d4..bfb03d63f5 100644
--- a/spamassassin/locale/pt/fusiondirectory.po
+++ b/spamassassin/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Nome"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/pt_BR/fusiondirectory.po b/spamassassin/locale/pt_BR/fusiondirectory.po
index 86007cdad1..d5a8d872d4 100644
--- a/spamassassin/locale/pt_BR/fusiondirectory.po
+++ b/spamassassin/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Nome"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Rule"
 msgstr "Regra"
-
-#: 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/ru/fusiondirectory.po b/spamassassin/locale/ru/fusiondirectory.po
index 49f202932f..cc488d47dc 100644
--- a/spamassassin/locale/ru/fusiondirectory.po
+++ b/spamassassin/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Название"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/ru@petr1708/fusiondirectory.po b/spamassassin/locale/ru@petr1708/fusiondirectory.po
index a1f894422d..4ff8e870de 100644
--- a/spamassassin/locale/ru@petr1708/fusiondirectory.po
+++ b/spamassassin/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: personal/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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr ""
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/sv/fusiondirectory.po b/spamassassin/locale/sv/fusiondirectory.po
index 97642bccf0..7fbdf6425e 100644
--- a/spamassassin/locale/sv/fusiondirectory.po
+++ b/spamassassin/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Namn"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/ug/fusiondirectory.po b/spamassassin/locale/ug/fusiondirectory.po
index 3971b5c1de..53897eee81 100644
--- a/spamassassin/locale/ug/fusiondirectory.po
+++ b/spamassassin/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr ""
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/vi_VN/fusiondirectory.po b/spamassassin/locale/vi_VN/fusiondirectory.po
index dd12434bd9..0c99e194f8 100644
--- a/spamassassin/locale/vi_VN/fusiondirectory.po
+++ b/spamassassin/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "Tên"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/zh/fusiondirectory.po b/spamassassin/locale/zh/fusiondirectory.po
index 702d1306f7..544eadb1ea 100644
--- a/spamassassin/locale/zh/fusiondirectory.po
+++ b/spamassassin/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-04-27 20:18+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,42 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: 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 ""
+
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
 msgid "Spamassassin service"
@@ -90,39 +126,3 @@ msgstr "名称"
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 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/ar/fusiondirectory.po b/squid/locale/ar/fusiondirectory.po
index c748a07ca1..5930087672 100644
--- a/squid/locale/ar/fusiondirectory.po
+++ b/squid/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/squid/locale/ca/fusiondirectory.po b/squid/locale/ca/fusiondirectory.po
index 8dbaec390e..258dca7ed9 100644
--- a/squid/locale/ca/fusiondirectory.po
+++ b/squid/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/squid/locale/cs_CZ/fusiondirectory.po b/squid/locale/cs_CZ/fusiondirectory.po
index 0f64621365..484c701001 100644
--- a/squid/locale/cs_CZ/fusiondirectory.po
+++ b/squid/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/squid/locale/de/fusiondirectory.po b/squid/locale/de/fusiondirectory.po
index 76893514a1..8ca39831fd 100644
--- a/squid/locale/de/fusiondirectory.po
+++ b/squid/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/squid/locale/el_GR/fusiondirectory.po b/squid/locale/el_GR/fusiondirectory.po
index d73edf0942..770698b66e 100644
--- a/squid/locale/el_GR/fusiondirectory.po
+++ b/squid/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/squid/locale/es/fusiondirectory.po b/squid/locale/es/fusiondirectory.po
index 4124a6aff9..625d4c8ad9 100644
--- a/squid/locale/es/fusiondirectory.po
+++ b/squid/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/squid/locale/es_CO/fusiondirectory.po b/squid/locale/es_CO/fusiondirectory.po
index 4a87ac375f..bb2afda020 100644
--- a/squid/locale/es_CO/fusiondirectory.po
+++ b/squid/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/squid/locale/es_VE/fusiondirectory.po b/squid/locale/es_VE/fusiondirectory.po
index d1e7b7eeaf..0987975754 100644
--- a/squid/locale/es_VE/fusiondirectory.po
+++ b/squid/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/squid/locale/fa_IR/fusiondirectory.po b/squid/locale/fa_IR/fusiondirectory.po
index ba62673a00..8bbe65b508 100644
--- a/squid/locale/fa_IR/fusiondirectory.po
+++ b/squid/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/squid/locale/fi_FI/fusiondirectory.po b/squid/locale/fi_FI/fusiondirectory.po
index b34c3de253..9f8774e2fa 100644
--- a/squid/locale/fi_FI/fusiondirectory.po
+++ b/squid/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/squid/locale/fr/fusiondirectory.po b/squid/locale/fr/fusiondirectory.po
index 6c74575e7c..609f89575f 100644
--- a/squid/locale/fr/fusiondirectory.po
+++ b/squid/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/squid/locale/hu_HU/fusiondirectory.po b/squid/locale/hu_HU/fusiondirectory.po
index 6caee0257e..72716e7c96 100644
--- a/squid/locale/hu_HU/fusiondirectory.po
+++ b/squid/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/squid/locale/id/fusiondirectory.po b/squid/locale/id/fusiondirectory.po
index af9a4f93da..bec94cd3e7 100644
--- a/squid/locale/id/fusiondirectory.po
+++ b/squid/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/squid/locale/it_IT/fusiondirectory.po b/squid/locale/it_IT/fusiondirectory.po
index bff7d317bc..e5fbf24c29 100644
--- a/squid/locale/it_IT/fusiondirectory.po
+++ b/squid/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:28+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/squid/locale/lv/fusiondirectory.po b/squid/locale/lv/fusiondirectory.po
index 14871bf122..0ab4250526 100644
--- a/squid/locale/lv/fusiondirectory.po
+++ b/squid/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/squid/locale/nb/fusiondirectory.po b/squid/locale/nb/fusiondirectory.po
index f97fbb57b7..decc31e838 100644
--- a/squid/locale/nb/fusiondirectory.po
+++ b/squid/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/squid/locale/nl/fusiondirectory.po b/squid/locale/nl/fusiondirectory.po
index 471a1c3459..d23e74d1cf 100644
--- a/squid/locale/nl/fusiondirectory.po
+++ b/squid/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/squid/locale/pl/fusiondirectory.po b/squid/locale/pl/fusiondirectory.po
index 5ce3c9d462..94e7dcc903 100644
--- a/squid/locale/pl/fusiondirectory.po
+++ b/squid/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/squid/locale/pt/fusiondirectory.po b/squid/locale/pt/fusiondirectory.po
index 4bddf3c5d2..6b0890b6a2 100644
--- a/squid/locale/pt/fusiondirectory.po
+++ b/squid/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/squid/locale/pt_BR/fusiondirectory.po b/squid/locale/pt_BR/fusiondirectory.po
index 2dc4a072a2..b09e95f06b 100644
--- a/squid/locale/pt_BR/fusiondirectory.po
+++ b/squid/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/squid/locale/ru/fusiondirectory.po b/squid/locale/ru/fusiondirectory.po
index bc54d18448..15cc2e4d17 100644
--- a/squid/locale/ru/fusiondirectory.po
+++ b/squid/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/squid/locale/ru@petr1708/fusiondirectory.po b/squid/locale/ru@petr1708/fusiondirectory.po
index 72da8309a3..2fc2e73a72 100644
--- a/squid/locale/ru@petr1708/fusiondirectory.po
+++ b/squid/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/squid/locale/sv/fusiondirectory.po b/squid/locale/sv/fusiondirectory.po
index b82b805a1a..7ce359d125 100644
--- a/squid/locale/sv/fusiondirectory.po
+++ b/squid/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/squid/locale/ug/fusiondirectory.po b/squid/locale/ug/fusiondirectory.po
index ed0c5889dd..2456f573af 100644
--- a/squid/locale/ug/fusiondirectory.po
+++ b/squid/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/squid/locale/vi_VN/fusiondirectory.po b/squid/locale/vi_VN/fusiondirectory.po
index 27ed941d7d..a001816b8c 100644
--- a/squid/locale/vi_VN/fusiondirectory.po
+++ b/squid/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/squid/locale/zh/fusiondirectory.po b/squid/locale/zh/fusiondirectory.po
index 900f4cd40b..907156cd66 100644
--- a/squid/locale/zh/fusiondirectory.po
+++ b/squid/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/ssh/locale/ar/fusiondirectory.po b/ssh/locale/ar/fusiondirectory.po
index fffe34c00c..b39eefa2db 100644
--- a/ssh/locale/ar/fusiondirectory.po
+++ b/ssh/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/ssh/locale/ca/fusiondirectory.po b/ssh/locale/ca/fusiondirectory.po
index 899b4e8ec7..e45ce03eab 100644
--- a/ssh/locale/ca/fusiondirectory.po
+++ b/ssh/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/ssh/locale/cs_CZ/fusiondirectory.po b/ssh/locale/cs_CZ/fusiondirectory.po
index d7c078d767..7a4128ea6a 100644
--- a/ssh/locale/cs_CZ/fusiondirectory.po
+++ b/ssh/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/ssh/locale/de/fusiondirectory.po b/ssh/locale/de/fusiondirectory.po
index ce462d7faf..41042f6ebe 100644
--- a/ssh/locale/de/fusiondirectory.po
+++ b/ssh/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/ssh/locale/el_GR/fusiondirectory.po b/ssh/locale/el_GR/fusiondirectory.po
index 2642830b3b..10349b588d 100644
--- a/ssh/locale/el_GR/fusiondirectory.po
+++ b/ssh/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/ssh/locale/es/fusiondirectory.po b/ssh/locale/es/fusiondirectory.po
index da513bd63b..76a7353760 100644
--- a/ssh/locale/es/fusiondirectory.po
+++ b/ssh/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/ssh/locale/es_CO/fusiondirectory.po b/ssh/locale/es_CO/fusiondirectory.po
index a245937e9b..775fda3f3f 100644
--- a/ssh/locale/es_CO/fusiondirectory.po
+++ b/ssh/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/ssh/locale/es_VE/fusiondirectory.po b/ssh/locale/es_VE/fusiondirectory.po
index 2e9615dea5..0dadb1be52 100644
--- a/ssh/locale/es_VE/fusiondirectory.po
+++ b/ssh/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/ssh/locale/fa_IR/fusiondirectory.po b/ssh/locale/fa_IR/fusiondirectory.po
index 9151c0420f..0ed7544494 100644
--- a/ssh/locale/fa_IR/fusiondirectory.po
+++ b/ssh/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/ssh/locale/fi_FI/fusiondirectory.po b/ssh/locale/fi_FI/fusiondirectory.po
index 2678bc3106..5e32a349d7 100644
--- a/ssh/locale/fi_FI/fusiondirectory.po
+++ b/ssh/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/ssh/locale/fr/fusiondirectory.po b/ssh/locale/fr/fusiondirectory.po
index 7c98691bc1..19ac3b2290 100644
--- a/ssh/locale/fr/fusiondirectory.po
+++ b/ssh/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/ssh/locale/hu_HU/fusiondirectory.po b/ssh/locale/hu_HU/fusiondirectory.po
index a68e49053f..5d970a3e55 100644
--- a/ssh/locale/hu_HU/fusiondirectory.po
+++ b/ssh/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/ssh/locale/id/fusiondirectory.po b/ssh/locale/id/fusiondirectory.po
index b0b482cd33..0dd1cb05bd 100644
--- a/ssh/locale/id/fusiondirectory.po
+++ b/ssh/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/ssh/locale/it_IT/fusiondirectory.po b/ssh/locale/it_IT/fusiondirectory.po
index 6e25f7f04d..d289eae046 100644
--- a/ssh/locale/it_IT/fusiondirectory.po
+++ b/ssh/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:29+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/ssh/locale/lv/fusiondirectory.po b/ssh/locale/lv/fusiondirectory.po
index 79fd153f54..968708d4f9 100644
--- a/ssh/locale/lv/fusiondirectory.po
+++ b/ssh/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/ssh/locale/nb/fusiondirectory.po b/ssh/locale/nb/fusiondirectory.po
index 8f9db45af8..889f155bdd 100644
--- a/ssh/locale/nb/fusiondirectory.po
+++ b/ssh/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/ssh/locale/nl/fusiondirectory.po b/ssh/locale/nl/fusiondirectory.po
index a46bf49109..4acce729e5 100644
--- a/ssh/locale/nl/fusiondirectory.po
+++ b/ssh/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/ssh/locale/pl/fusiondirectory.po b/ssh/locale/pl/fusiondirectory.po
index 04d634c1ba..6145fa6cf8 100644
--- a/ssh/locale/pl/fusiondirectory.po
+++ b/ssh/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/ssh/locale/pt/fusiondirectory.po b/ssh/locale/pt/fusiondirectory.po
index 478af52048..b45f54c51a 100644
--- a/ssh/locale/pt/fusiondirectory.po
+++ b/ssh/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/ssh/locale/pt_BR/fusiondirectory.po b/ssh/locale/pt_BR/fusiondirectory.po
index 0502930a16..3e7fa6202b 100644
--- a/ssh/locale/pt_BR/fusiondirectory.po
+++ b/ssh/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/ssh/locale/ru/fusiondirectory.po b/ssh/locale/ru/fusiondirectory.po
index 63221d58af..64b332d878 100644
--- a/ssh/locale/ru/fusiondirectory.po
+++ b/ssh/locale/ru/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-11 15:54+0000\n"
 "Last-Translator: Alexey Matveev\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/ssh/locale/ru@petr1708/fusiondirectory.po b/ssh/locale/ru@petr1708/fusiondirectory.po
index 2183d6b387..ff3ab2b33c 100644
--- a/ssh/locale/ru@petr1708/fusiondirectory.po
+++ b/ssh/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/ssh/locale/sv/fusiondirectory.po b/ssh/locale/sv/fusiondirectory.po
index 7e3c859e03..749d9430f9 100644
--- a/ssh/locale/sv/fusiondirectory.po
+++ b/ssh/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/ssh/locale/ug/fusiondirectory.po b/ssh/locale/ug/fusiondirectory.po
index 35285d99ec..0f10d9993c 100644
--- a/ssh/locale/ug/fusiondirectory.po
+++ b/ssh/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/ssh/locale/vi_VN/fusiondirectory.po b/ssh/locale/vi_VN/fusiondirectory.po
index 26ff276375..cb35f91114 100644
--- a/ssh/locale/vi_VN/fusiondirectory.po
+++ b/ssh/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/ssh/locale/zh/fusiondirectory.po b/ssh/locale/zh/fusiondirectory.po
index 353d7a7567..2b80f15fc2 100644
--- a/ssh/locale/zh/fusiondirectory.po
+++ b/ssh/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:02+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/subcontracting/locale/ar/fusiondirectory.po b/subcontracting/locale/ar/fusiondirectory.po
index 1313e85e24..413886a9b4 100644
--- a/subcontracting/locale/ar/fusiondirectory.po
+++ b/subcontracting/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/subcontracting/locale/ca/fusiondirectory.po b/subcontracting/locale/ca/fusiondirectory.po
index 2d89c2ad23..99da391a95 100644
--- a/subcontracting/locale/ca/fusiondirectory.po
+++ b/subcontracting/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/subcontracting/locale/cs_CZ/fusiondirectory.po b/subcontracting/locale/cs_CZ/fusiondirectory.po
index a93e48b908..c91cb2a298 100644
--- a/subcontracting/locale/cs_CZ/fusiondirectory.po
+++ b/subcontracting/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/subcontracting/locale/de/fusiondirectory.po b/subcontracting/locale/de/fusiondirectory.po
index eaf6bd53da..3daa9fe6dc 100644
--- a/subcontracting/locale/de/fusiondirectory.po
+++ b/subcontracting/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/subcontracting/locale/el_GR/fusiondirectory.po b/subcontracting/locale/el_GR/fusiondirectory.po
index 582b65965b..c6a168aa36 100644
--- a/subcontracting/locale/el_GR/fusiondirectory.po
+++ b/subcontracting/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/subcontracting/locale/es/fusiondirectory.po b/subcontracting/locale/es/fusiondirectory.po
index b36991c582..ab53cc841d 100644
--- a/subcontracting/locale/es/fusiondirectory.po
+++ b/subcontracting/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/subcontracting/locale/es_CO/fusiondirectory.po b/subcontracting/locale/es_CO/fusiondirectory.po
index 17dc40f804..67ae5f74e5 100644
--- a/subcontracting/locale/es_CO/fusiondirectory.po
+++ b/subcontracting/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/subcontracting/locale/es_VE/fusiondirectory.po b/subcontracting/locale/es_VE/fusiondirectory.po
index 8d399c5512..f727a20951 100644
--- a/subcontracting/locale/es_VE/fusiondirectory.po
+++ b/subcontracting/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/subcontracting/locale/fa_IR/fusiondirectory.po b/subcontracting/locale/fa_IR/fusiondirectory.po
index 7affd316ad..10f233ea3c 100644
--- a/subcontracting/locale/fa_IR/fusiondirectory.po
+++ b/subcontracting/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/subcontracting/locale/fi_FI/fusiondirectory.po b/subcontracting/locale/fi_FI/fusiondirectory.po
index 72ef8b058e..9ff6607910 100644
--- a/subcontracting/locale/fi_FI/fusiondirectory.po
+++ b/subcontracting/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-02-25 10:29+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/subcontracting/locale/fr/fusiondirectory.po b/subcontracting/locale/fr/fusiondirectory.po
index 171e8c44ed..b8979409f9 100644
--- a/subcontracting/locale/fr/fusiondirectory.po
+++ b/subcontracting/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:28+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/subcontracting/locale/hu_HU/fusiondirectory.po b/subcontracting/locale/hu_HU/fusiondirectory.po
index aed0314dea..b89c8b8067 100644
--- a/subcontracting/locale/hu_HU/fusiondirectory.po
+++ b/subcontracting/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/subcontracting/locale/id/fusiondirectory.po b/subcontracting/locale/id/fusiondirectory.po
index 1957ab4fdf..9de1d49be2 100644
--- a/subcontracting/locale/id/fusiondirectory.po
+++ b/subcontracting/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/subcontracting/locale/it_IT/fusiondirectory.po b/subcontracting/locale/it_IT/fusiondirectory.po
index 004b62f90d..6e72bdb2f4 100644
--- a/subcontracting/locale/it_IT/fusiondirectory.po
+++ b/subcontracting/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 14:39+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/subcontracting/locale/lv/fusiondirectory.po b/subcontracting/locale/lv/fusiondirectory.po
index bfce008f96..0e6326d302 100644
--- a/subcontracting/locale/lv/fusiondirectory.po
+++ b/subcontracting/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/subcontracting/locale/nb/fusiondirectory.po b/subcontracting/locale/nb/fusiondirectory.po
index cab9bee858..f348e96b9f 100644
--- a/subcontracting/locale/nb/fusiondirectory.po
+++ b/subcontracting/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/subcontracting/locale/nl/fusiondirectory.po b/subcontracting/locale/nl/fusiondirectory.po
index 04e9566f43..b644da3603 100644
--- a/subcontracting/locale/nl/fusiondirectory.po
+++ b/subcontracting/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/subcontracting/locale/pl/fusiondirectory.po b/subcontracting/locale/pl/fusiondirectory.po
index 3856a10692..f40e12c076 100644
--- a/subcontracting/locale/pl/fusiondirectory.po
+++ b/subcontracting/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/subcontracting/locale/pt/fusiondirectory.po b/subcontracting/locale/pt/fusiondirectory.po
index 1898ada272..16d962f595 100644
--- a/subcontracting/locale/pt/fusiondirectory.po
+++ b/subcontracting/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/subcontracting/locale/pt_BR/fusiondirectory.po b/subcontracting/locale/pt_BR/fusiondirectory.po
index de5d1060ef..0710668963 100644
--- a/subcontracting/locale/pt_BR/fusiondirectory.po
+++ b/subcontracting/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/subcontracting/locale/ru/fusiondirectory.po b/subcontracting/locale/ru/fusiondirectory.po
index 53771e5e3a..1820662379 100644
--- a/subcontracting/locale/ru/fusiondirectory.po
+++ b/subcontracting/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/subcontracting/locale/ru@petr1708/fusiondirectory.po b/subcontracting/locale/ru@petr1708/fusiondirectory.po
index d8fa4cc99b..6f2d716d89 100644
--- a/subcontracting/locale/ru@petr1708/fusiondirectory.po
+++ b/subcontracting/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/subcontracting/locale/sv/fusiondirectory.po b/subcontracting/locale/sv/fusiondirectory.po
index 943f14db58..00178569aa 100644
--- a/subcontracting/locale/sv/fusiondirectory.po
+++ b/subcontracting/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/subcontracting/locale/ug/fusiondirectory.po b/subcontracting/locale/ug/fusiondirectory.po
index a88f7b2c84..8c557cc0c8 100644
--- a/subcontracting/locale/ug/fusiondirectory.po
+++ b/subcontracting/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/subcontracting/locale/vi_VN/fusiondirectory.po b/subcontracting/locale/vi_VN/fusiondirectory.po
index b2043f5f71..c80aa1f71b 100644
--- a/subcontracting/locale/vi_VN/fusiondirectory.po
+++ b/subcontracting/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/subcontracting/locale/zh/fusiondirectory.po b/subcontracting/locale/zh/fusiondirectory.po
index 754a9754f2..565cbec047 100644
--- a/subcontracting/locale/zh/fusiondirectory.po
+++ b/subcontracting/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-03-01 17:15+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/sudo/locale/ar/fusiondirectory.po b/sudo/locale/ar/fusiondirectory.po
index 0b9c9891fc..256b7d9152 100644
--- a/sudo/locale/ar/fusiondirectory.po
+++ b/sudo/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "الإسم"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "الوصف"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "أنظمة"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/ca/fusiondirectory.po b/sudo/locale/ca/fusiondirectory.po
index ed2d424a1b..e141ff9aba 100644
--- a/sudo/locale/ca/fusiondirectory.po
+++ b/sudo/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Nom"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/cs_CZ/fusiondirectory.po b/sudo/locale/cs_CZ/fusiondirectory.po
index 1d8615510f..d335db9956 100644
--- a/sudo/locale/cs_CZ/fusiondirectory.po
+++ b/sudo/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -18,6 +18,31 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr "Nastavení sudo"
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr "Nastavení zásuvného modulu sudo pro FusionDirectory"
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr "sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr "Relativní rozlišený název pro sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr "Větev, ve které budou ukládáni držitelé práv sudo"
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr "Správa sudo"
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr "Neznámá předvolba"
@@ -56,102 +81,77 @@ msgstr "Předvolby"
 msgid "Sudo options"
 msgstr "Předvolby sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr "sudo"
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr "Správa sudo"
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr "Role v sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr "Nastavení role"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Název"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr "Název role"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Popis"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr "Popis pro novou roli sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr "Příkazy"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr "Unixový příkaz s volitelnými argumenty, případně obsahující zástupné znaky"
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr "Spustit jako (uživatel)"
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr "Uživatelé, ztělesnění v sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr "Spustit jako (skupina)"
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr "Skupiny, ztělesněné prostřednictvím sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Systémy"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr "Název počítače, IP adresa nebo síť"
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Uživatelé a skupiny"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr "Uživatelské jméno, identifikátor (předeslaný znakem #), unixová skupiny (předeslaná znakem %)"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Priorita"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr "Pořadí přednosti tohoto pravidla v porovnání s ostatními"
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr "Nastavení sudo"
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr "Nastavení zásuvného modulu sudo pro FusionDirectory"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr "Relativní rozlišený název pro sudo"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr "Větev, ve které budou ukládáni držitelé práv sudo"
diff --git a/sudo/locale/de/fusiondirectory.po b/sudo/locale/de/fusiondirectory.po
index 1366bd87d3..cea24f99bc 100644
--- a/sudo/locale/de/fusiondirectory.po
+++ b/sudo/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,31 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr "Sudo Konfiguration"
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr "FusionDirectory sudo Pluginkonfiguration"
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr "Sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr "Sudo RDN"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr "Zweig in dem sudoers gespeichert werden wird"
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr "SUDO-Verwaltung"
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr "Unbekannte Option"
@@ -56,102 +81,77 @@ msgstr "Optionen"
 msgid "Sudo options"
 msgstr "Sudo-Optionen"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr "Sudo"
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr "SUDO-Verwaltung"
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr "Sudo-Rolle"
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr "Rolleneinstellungen"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Name"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr "Name der Rolle"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr "Beschreibung für die neue sudo-Rolle"
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr "Kommandos"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr "Ein Unix-Befehl mit optionalen Kommandozeilenargumenten, potentiell inklusive globbing-Zeichen (aka wild cards)"
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr "Ausführen als (Benutzer)"
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr "Ausführen als (Gruppe)"
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Systeme"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr "Ein Hostname, IP Adresse oder IP-Netzwerk"
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Benutzer und Gruppen"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr "Ein Benutzername, user ID (mit Prefix '#'), Unixgruppe (mit Prefix '#')"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Priorität"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr "Sudo Konfiguration"
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr "FusionDirectory sudo Pluginkonfiguration"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr "Sudo RDN"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr "Zweig in dem sudoers gespeichert werden wird"
diff --git a/sudo/locale/el_GR/fusiondirectory.po b/sudo/locale/el_GR/fusiondirectory.po
index 1005369f07..12989942b0 100644
--- a/sudo/locale/el_GR/fusiondirectory.po
+++ b/sudo/locale/el_GR/fusiondirectory.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -20,6 +20,31 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr "Διαμόρφωση Sudo"
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory sudo"
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr "Sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr "Sudo RDN"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr "Κλάδος στον οποίο θα αποθηκεύονται οι sudoers"
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr "Διαχείριση Sudo"
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr "Άγνωστη επιλογή"
@@ -58,102 +83,77 @@ msgstr "Επιλογές"
 msgid "Sudo options"
 msgstr "Επιλογές Sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr "Sudo"
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr "Διαχείριση Sudo"
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr "Ρόλος Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr "Ρυθμίσεις ρόλου"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Όνομα"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr "Όνομα του ρόλου"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr "Περιγραφή του νέου ρόλου sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr "Εντολές"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr "Μια εντολή Unix με προαιρετικές παραμέτρους γραμμής εντολών, με δυνατότητα συμπερίληψης wild cards"
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr "Εκτέλεση ως (χρήστης)"
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr "Χρήστες impersonated από sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr "Εκτέλεση ως (ομάδα)"
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr "Ομάδες mpersonated από sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Συστήματα "
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr "Ένα όνομα υπολογιστή, μια διεύθυνση  IP, ή ένα δίκτυο IP "
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Χρήστες και ομάδες"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr "Ένα όνομα χρήστη, ταυτότητα χρήστη (ID με πρόθεμα '#'), ομάδα (Unix group με πρόθεμα '%')"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr "Συσχέτιση της προτεραιότητας αυτού του ρόλου με άλλων."
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr "Διαμόρφωση Sudo"
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory sudo"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr "Sudo RDN"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr "Κλάδος στον οποίο θα αποθηκεύονται οι sudoers"
diff --git a/sudo/locale/es/fusiondirectory.po b/sudo/locale/es/fusiondirectory.po
index 79a439554c..81eb17f0fd 100644
--- a/sudo/locale/es/fusiondirectory.po
+++ b/sudo/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr "Sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr "Administración Sudo"
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr "Opción desconocida"
@@ -55,102 +80,77 @@ msgstr "Opciones"
 msgid "Sudo options"
 msgstr "Opciones Sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr "Sudo"
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr "Administración Sudo"
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr "Rol Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr "Comandos"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Prioridad"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/es_CO/fusiondirectory.po b/sudo/locale/es_CO/fusiondirectory.po
index 71f98ccf15..2ab2b2cf88 100644
--- a/sudo/locale/es_CO/fusiondirectory.po
+++ b/sudo/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr "Nombre del Rol"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Usuarios y Grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/es_VE/fusiondirectory.po b/sudo/locale/es_VE/fusiondirectory.po
index 0198bd8540..74b731992f 100644
--- a/sudo/locale/es_VE/fusiondirectory.po
+++ b/sudo/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr "Sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr "Administración Sudo"
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr "Opción desconocida"
@@ -55,102 +80,77 @@ msgstr "Opciones"
 msgid "Sudo options"
 msgstr "Opciones Sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr "Sudo"
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr "Administración Sudo"
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr "Rol Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr "Comandos"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Prioridad"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/fa_IR/fusiondirectory.po b/sudo/locale/fa_IR/fusiondirectory.po
index c10f0ea1c8..6208792d9e 100644
--- a/sudo/locale/fa_IR/fusiondirectory.po
+++ b/sudo/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/fi_FI/fusiondirectory.po b/sudo/locale/fi_FI/fusiondirectory.po
index ea506a11a7..4c090849f9 100644
--- a/sudo/locale/fi_FI/fusiondirectory.po
+++ b/sudo/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Kuvaus"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/fr/fusiondirectory.po b/sudo/locale/fr/fusiondirectory.po
index 46fbcb2aff..ae012a6f5a 100644
--- a/sudo/locale/fr/fusiondirectory.po
+++ b/sudo/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -19,6 +19,31 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr "Configuration Sudo"
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr "Configuration du plugin sudo"
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr "Sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr "Branche sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr "Branche où seront stockés les sudoers"
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr "Gestion sudo"
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr "Option inconnue"
@@ -57,102 +82,77 @@ msgstr "Options"
 msgid "Sudo options"
 msgstr "Options Sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr "Sudo"
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr "Gestion sudo"
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr "Rôle sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr "Paramètres du rôle"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Nom"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr "Nom du rôle "
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Description"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr "Description du nouveau rôle sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr "Commandes"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr "Une commande Unix avec éventuellement des arguments de ligne de commande, y compris des caractères joker (wildcards)"
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr "Exécuter comme (utilisateur)"
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr "Utilisateur(s) personnifié par sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr "Exécuter comme (groupe)"
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr "Groupe(s) personnifié par sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Systèmes"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr "Un nom d'hôte, une adresse IP ou un réseau IP"
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Utilisateurs et groupes"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr "Un nom d'utilisateur, ID utilisateur (préfixé par '#'), groupe Unix (préfixé par '%')"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Priorité"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr "La priorité de cette règle par rapport aux autres"
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr "Configuration Sudo"
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr "Configuration du plugin sudo"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr "Branche sudo"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr "Branche où seront stockés les sudoers"
diff --git a/sudo/locale/hu_HU/fusiondirectory.po b/sudo/locale/hu_HU/fusiondirectory.po
index ecf0ba37bf..9886c46ff2 100644
--- a/sudo/locale/hu_HU/fusiondirectory.po
+++ b/sudo/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Név"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Leírás"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/id/fusiondirectory.po b/sudo/locale/id/fusiondirectory.po
index a64e5c651b..bb34787bc3 100644
--- a/sudo/locale/id/fusiondirectory.po
+++ b/sudo/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/it_IT/fusiondirectory.po b/sudo/locale/it_IT/fusiondirectory.po
index fe6f52d23a..9655a74c7c 100644
--- a/sudo/locale/it_IT/fusiondirectory.po
+++ b/sudo/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:29+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,6 +19,31 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr "Configurazione di Sudo"
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr "Configurazione del plugin Sudo di FusionDirectory"
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr "Sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr "RDN Sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr "Ramo nel quale i sudo saranno immagazzinati"
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr "Gestione di Sudo"
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr "Opzione sconosciuta"
@@ -57,102 +82,77 @@ msgstr "Opzioni"
 msgid "Sudo options"
 msgstr "Opzioni di Sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr "Sudo"
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr "Gestione di Sudo"
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr "Ruolo Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr "Impostazioni del ruolo"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr "Nome del ruolo"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr "Descrizione per il nuovo ruolo di sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr "comandi"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr "Un comando Unix con gli argomenti della riga di comando opzionali, potenzialmente compresi i caratteri wildcard (jolly)"
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr "Esegui come utente"
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr "Utente(i) impersonato da Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr "Esegui come gruppo"
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr "Grippo(i) impersonato da Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Sistemi"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr "Un nome d'host, indirizzo IP o network IP"
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Utenti e gruppi"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr "Un nome utente, ID utente (prefissato da '#'), gruppo Unix (prefissato da '%')"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Priorità"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr "La priorità di questa regola comparata alle altre"
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr "Configurazione di Sudo"
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr "Configurazione del plugin Sudo di FusionDirectory"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr "RDN Sudo"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr "Ramo nel quale i sudo saranno immagazzinati"
diff --git a/sudo/locale/lv/fusiondirectory.po b/sudo/locale/lv/fusiondirectory.po
index 456c9cbfd0..fd5e34bb79 100644
--- a/sudo/locale/lv/fusiondirectory.po
+++ b/sudo/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Vārds "
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Apraksts"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/nb/fusiondirectory.po b/sudo/locale/nb/fusiondirectory.po
index 7974a31aae..b0b793c16d 100644
--- a/sudo/locale/nb/fusiondirectory.po
+++ b/sudo/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Navn"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/nl/fusiondirectory.po b/sudo/locale/nl/fusiondirectory.po
index 2889ae68d5..e284ecbf37 100644
--- a/sudo/locale/nl/fusiondirectory.po
+++ b/sudo/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr "Sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr "Sudo beheer"
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr "Onbekende optie"
@@ -55,102 +80,77 @@ msgstr "Opties"
 msgid "Sudo options"
 msgstr "Sudo opties"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr "Sudo"
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr "Sudo beheer"
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr "Sudo rol"
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Naam"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr "Naam van de rol"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr "Commando's"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Systemen"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Gebruikers en groepen"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/pl/fusiondirectory.po b/sudo/locale/pl/fusiondirectory.po
index 21f78e710e..0fc3b99df8 100644
--- a/sudo/locale/pl/fusiondirectory.po
+++ b/sudo/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr "Opcje"
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Opis"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Systemy"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Priorytet"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/pt/fusiondirectory.po b/sudo/locale/pt/fusiondirectory.po
index 2a9615fd98..2cfd23d5a0 100644
--- a/sudo/locale/pt/fusiondirectory.po
+++ b/sudo/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Descrição"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/pt_BR/fusiondirectory.po b/sudo/locale/pt_BR/fusiondirectory.po
index d75f048f14..ad3597e29e 100644
--- a/sudo/locale/pt_BR/fusiondirectory.po
+++ b/sudo/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr "Configuração sudo"
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr "Configuração de plugin sudo do FusionDirectory"
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr "Sudo"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr "sudo RDN"
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr "Filial em que sudoers serão armazenados"
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr "Gestação sudo"
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr "Opção desconhecida"
@@ -55,102 +80,77 @@ msgstr "Opções"
 msgid "Sudo options"
 msgstr "Opções de sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr "Sudo"
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr "Gestação sudo"
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr "Função sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr "Nome da atribuição"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Descrição"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr "Descrição da nova função do sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr "Comandos"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr "Um comando Unix com argumento de linha de comando opcional, potencialmente incluindo caracteres globais(aka wild card)"
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr "Um nome de host, endereço IP ou rede IP"
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Usuários e grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr "Um nome de usuário, ID(Prefixado com'#'), grupo Unix(prefixado com '%')"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr "Configuração sudo"
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr "Configuração de plugin sudo do FusionDirectory"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr "sudo RDN"
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr "Filial em que sudoers serão armazenados"
diff --git a/sudo/locale/ru/fusiondirectory.po b/sudo/locale/ru/fusiondirectory.po
index bf38729453..b8b6a78169 100644
--- a/sudo/locale/ru/fusiondirectory.po
+++ b/sudo/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr "Параметры"
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr "Имя роли"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Описание"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Системы"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr "Пользователи и группы"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Приоритет"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/ru@petr1708/fusiondirectory.po b/sudo/locale/ru@petr1708/fusiondirectory.po
index a103f00aba..3ae8bd737a 100644
--- a/sudo/locale/ru@petr1708/fusiondirectory.po
+++ b/sudo/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/sv/fusiondirectory.po b/sudo/locale/sv/fusiondirectory.po
index 04e741c08c..33fbb5f289 100644
--- a/sudo/locale/sv/fusiondirectory.po
+++ b/sudo/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr "Alternativ"
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Namn"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Beskrivning"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "System"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "Prioritet"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/ug/fusiondirectory.po b/sudo/locale/ug/fusiondirectory.po
index cd45cc0d27..6fc6d70997 100644
--- a/sudo/locale/ug/fusiondirectory.po
+++ b/sudo/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/vi_VN/fusiondirectory.po b/sudo/locale/vi_VN/fusiondirectory.po
index 368ea22ffb..5ad0d3c16b 100644
--- a/sudo/locale/vi_VN/fusiondirectory.po
+++ b/sudo/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr ""
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "Tên"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "Mô tả"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "Các hệ thống"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/sudo/locale/zh/fusiondirectory.po b/sudo/locale/zh/fusiondirectory.po
index bc700c661f..6f2322ed53 100644
--- a/sudo/locale/zh/fusiondirectory.po
+++ b/sudo/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,31 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
+#: admin/sudo/class_sudoGeneric.inc:123
+msgid "Sudo"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
 msgstr ""
@@ -55,102 +80,77 @@ msgstr "选项"
 msgid "Sudo options"
 msgstr ""
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
-#: config/sudo/class_sudoConfig.inc:42
-msgid "Sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:33
-msgid "Sudo management"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
+#: admin/sudo/class_sudoGeneric.inc:143
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name"
 msgstr "名称"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:149
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description"
 msgstr "描述"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:159
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
+#: admin/sudo/class_sudoGeneric.inc:166
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:164
+#: admin/sudo/class_sudoGeneric.inc:167
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
+#: admin/sudo/class_sudoGeneric.inc:174
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
+#: admin/sudo/class_sudoGeneric.inc:175
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "Systems"
 msgstr "系统设置"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:181
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:187
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "Priority"
 msgstr "优先级"
 
-#: admin/sudo/class_sudoGeneric.inc:188
+#: admin/sudo/class_sudoGeneric.inc:191
 msgid "This rule priority compared to others"
 msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:28
-msgid "Sudo configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:29
-msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Sudo RDN"
-msgstr ""
-
-#: config/sudo/class_sudoConfig.inc:45
-msgid "Branch in which sudoers will be stored"
-msgstr ""
diff --git a/supann/locale/ar/fusiondirectory.po b/supann/locale/ar/fusiondirectory.po
index 6df1f45441..230fcc9cdb 100644
--- a/supann/locale/ar/fusiondirectory.po
+++ b/supann/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,237 +17,6 @@ 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/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "الإسم"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "الفاكس"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "الوصف"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "الخواص"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "العنوان"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "الخواص"
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr "الإسم"
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr "الوصف"
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "العنوان"
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr "الفاكس"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/ca/fusiondirectory.po b/supann/locale/ca/fusiondirectory.po
index 67779eb0a2..996f31c803 100644
--- a/supann/locale/ca/fusiondirectory.po
+++ b/supann/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Nom"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Adreça postal"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Localització"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Adreça"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Error d'LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr "Nom"
+
+#: 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 "Localització"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Adreça"
+
+#: 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 "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Error d'LDAP"
+
+#: 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 informations"
+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 "Adreça postal"
+
+#: 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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/cs_CZ/fusiondirectory.po b/supann/locale/cs_CZ/fusiondirectory.po
index fb26292beb..060d3e9434 100644
--- a/supann/locale/cs_CZ/fusiondirectory.po
+++ b/supann/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr "Struktury Supann"
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr "Správa struktur Supann"
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr "Entita"
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr "Nastavení SUPANN entity"
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr "SUPANN entita"
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Název"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr "Název, který této entitě zapsat do atributu Organizační jednotka"
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr "Správní údaje"
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Telefon"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr "Telefonní číslo této entity"
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr "Faxové číslo této entity"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Poštovní adresa"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr "Poštovní adresa této entity"
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Popis"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr "Stručný popis této entity"
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr "Informace o SUPANN"
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr "Typ entity"
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr "SUPANN typ, nejlépe odpovídající této entitě"
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr "Kód entity"
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr "SUPANN kód této entity"
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr "Nadřazená entita"
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr "Nadřazená entita této entity"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr "Referenční identifikátor"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr "Identifikátor SUPANN odkazu této entity"
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr "Instituce"
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr "SUPANN nastavení instituce"
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr "SUPANN instituce"
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr "Zastřešující organizace"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr "Nastavit tuto instituci jako kořenovou"
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr "Název, který zapsat do atributu o (ó) této instituce"
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr "Stručný popis této instituce"
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Umístění"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr "Obvykle město, ve kterém se tato instituce nachází"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Adresa"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr "Poštovní adresa této instituce"
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr "Telefonní číslo do této instituce"
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr "Faxové číslo do této instituce"
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr "Vlastnosti SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr "Kód instituce"
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr "Kód této instituce (je třeba, předponu byla uvedena ve složených závorkách – { } )"
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr "SUPANN kód"
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr "SUPANN kód této instituce"
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr "Úřední název"
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr "Úřední název této instituce"
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr "Adresa domovské stránky"
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr "URI adresa domovských webových stránek této instituce"
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr "URI adresa instituce"
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr "URI adresa webových stránek této instituce"
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr "URI adresa „bílých stránek“ (white pages)"
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr "URI adresa „bílých stránek“ (UDDI) této instituce"
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Chyba LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr "Chyba v souboru"
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr "Nelze načíst soubor: %s"
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr "eduPersonAffiliation – status osobz: student, BIATOSS, pedagog, externista, penzionovaný, hostovaný personál (CNRS, INSERM, atd.), dřívější student, atd."
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr "Instituce"
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr "Umožnit pro obnovení zapomenutého hesla použít e-mailovou adresu ze SUPANN účtu, z kolonky osobní e-mailová adresa"
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr "Struktury Supann"
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr "Správa struktur Supann"
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr "Chyba v souboru"
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr "Nelze načíst soubor: %s"
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr "SUPANN nastavení instituce"
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr "SUPANN instituce"
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr "Zastřešující organizace"
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr "Nastavit tuto instituci jako kořenovou"
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr "Název"
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr "Název, který zapsat do atributu o (ó) této instituce"
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr "Popis"
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr "Stručný popis této instituce"
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr "Umístění"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr "Obvykle město, ve kterém se tato instituce nachází"
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Adresa"
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr "Poštovní adresa této instituce"
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr "Telefon"
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr "Telefonní číslo do této instituce"
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr "Faxové číslo do této instituce"
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr "Vlastnosti SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr "Kód instituce"
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr "Kód této instituce (je třeba, předponu byla uvedena ve složených závorkách – { } )"
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr "SUPANN kód"
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr "SUPANN kód této instituce"
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr "Úřední název"
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr "Úřední název této instituce"
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr "Adresa domovské stránky"
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr "URI adresa domovských webových stránek této instituce"
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr "URI adresa instituce"
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr "URI adresa webových stránek této instituce"
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr "URI adresa „bílých stránek“ (white pages)"
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr "URI adresa „bílých stránek“ (UDDI) této instituce"
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Chyba LDAP"
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr "Entita"
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr "Nastavení SUPANN entity"
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr "SUPANN entita"
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr "Název, který této entitě zapsat do atributu Organizační jednotka"
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative informations"
+msgstr "Správní údaje"
+
+#: admin/supannStructures/class_entite.inc:64
+msgid "Phone number for this entity"
+msgstr "Telefonní číslo této entity"
+
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax number for this entity"
+msgstr "Faxové číslo této entity"
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address"
+msgstr "Poštovní adresa"
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address of this entity"
+msgstr "Poštovní adresa této entity"
+
+#: admin/supannStructures/class_entite.inc:76
+msgid "Short description of this entity"
+msgstr "Stručný popis této entity"
+
+#: admin/supannStructures/class_entite.inc:82
+msgid "SUPANN informations"
+msgstr "Informace o SUPANN"
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr "Typ entity"
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr "SUPANN typ, nejlépe odpovídající této entitě"
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr "Kód entity"
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr "SUPANN kód této entity"
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr "Nadřazená entita"
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr "Nadřazená entita této entity"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr "Referenční identifikátor"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr "Identifikátor SUPANN odkazu této entity"
diff --git a/supann/locale/de/fusiondirectory.po b/supann/locale/de/fusiondirectory.po
index 24d71b1576..da83629af3 100644
--- a/supann/locale/de/fusiondirectory.po
+++ b/supann/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr "Supann-Strukturen"
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr "Supann-Strukturverwaltung"
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr "Einheit"
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr "SUPANN-Einheitseinstellungen"
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr "SUPANN-Einheit"
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Name"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr "Administrative Informationen"
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Telefon"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr "Telefonnummer für diese Einheit"
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr "Faxnummer für diese Einheit"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Postalische Anschrift"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr "Postalische Anschrift von dieser Einheit"
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Beschreibung"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr "Kurze Beschreibung von dieser Einheit"
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr "SUPANN-Informationen"
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr "Einheitstyp"
-
-#: 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 "Einheitscode"
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr "Der SUPANN-Code dieser Einheit"
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr "Übergeordnete Einheit"
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr "Die übergeordnete Einheit von dieser Einheit"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr "Referenzkennung"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr "SUPANN-Referenzkennung dieser Einheit"
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Ort"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Adresse"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr "SUPANN-Eigenschaften"
-
-#: 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 "SUPANN-Code"
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "LDAP-Fehler"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr "Dateifehler"
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr "Kann Datei nicht lesen: '%s'"
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr "Supann-Strukturen"
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr "Supann-Strukturverwaltung"
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr "Dateifehler"
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr "Kann Datei nicht lesen: '%s'"
+
+#: 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 "Eigenschaften"
+
+#: 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 "Name"
+
+#: 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 "Beschreibung"
+
+#: 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 "Ort"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Adresse"
+
+#: 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 "Telefon"
+
+#: 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 "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr "SUPANN-Eigenschaften"
+
+#: 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 "SUPANN-Code"
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "LDAP-Fehler"
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr "Einheit"
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr "SUPANN-Einheitseinstellungen"
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr "SUPANN-Einheit"
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative informations"
+msgstr "Administrative Informationen"
+
+#: admin/supannStructures/class_entite.inc:64
+msgid "Phone number for this entity"
+msgstr "Telefonnummer für diese Einheit"
+
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax number for this entity"
+msgstr "Faxnummer für diese Einheit"
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address"
+msgstr "Postalische Anschrift"
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address of this entity"
+msgstr "Postalische Anschrift von dieser Einheit"
+
+#: admin/supannStructures/class_entite.inc:76
+msgid "Short description of this entity"
+msgstr "Kurze Beschreibung von dieser Einheit"
+
+#: admin/supannStructures/class_entite.inc:82
+msgid "SUPANN informations"
+msgstr "SUPANN-Informationen"
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr "Einheitstyp"
+
+#: 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 "Einheitscode"
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr "Der SUPANN-Code dieser Einheit"
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr "Übergeordnete Einheit"
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr "Die übergeordnete Einheit von dieser Einheit"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr "Referenzkennung"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr "SUPANN-Referenzkennung dieser Einheit"
diff --git a/supann/locale/el_GR/fusiondirectory.po b/supann/locale/el_GR/fusiondirectory.po
index cab00c61ae..7e845f9cc8 100644
--- a/supann/locale/el_GR/fusiondirectory.po
+++ b/supann/locale/el_GR/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -19,237 +19,6 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr "Δομές Supann"
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr "Διαχείριση δομών Supann"
-
-#: 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 "Ρυθμίσεις οντότητας SUPANN"
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr "Οντότητα SUPANN"
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Όνομα"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr "Το όνομα που θα εγγράφεται στο γνώρισμα ou για αυτή την οντότητα"
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr "Διαχειριστικές πληροφορίες"
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Τηλέφωνο"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr "Αριθμός τηλεφώνου για αυτή την οντότητα"
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Φαξ"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr "Ο αριθμός φαξ  για αυτή την οντότητα"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Ταχυδρομική διεύθυνση"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr "Η ταχυδρομική διεύθυνση  για αυτή την οντότητα"
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Περιγραφή"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr "Σύντομη περιγραφή για αυτή την οντότητα"
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr "Πληροφορίες SUPANN"
-
-#: 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 "Ο βέλτιστος τύπος SUPANN που ταιριάζει σε αυτή την οντότητα"
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr "Κωδικός οντότητα"
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr "Ο κωδικός SUPANN για αυτή την οντότητα"
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr "Γονική οντότητα"
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr "Η γονική οντότητα αυτής της οντότητας"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr "ID αναφοράς"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr "ID αναφοράς του SUPANN για αυτή την οντότητα"
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr "Εγκαθίδρυση"
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr "Ρυθμίσεις εγκαθίδρυση SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr "Εγκαθίδρυση SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Ιδιότητες"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr "Κύρια εγκαθίδρυση "
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr "Ορισρμός αυτής της εγκαθίδρυση σαν κύρια"
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr "Το όνομα που θα εγγράφεται στο γνώρισμα o για αυτή την Τοποθέτηση"
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr "Μια σύντομη περιγραφή της Τοποθέτησης"
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Τοποθεσία"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr "Συνήθως η πόλη όπου βρίσκεται η Τοποθέτηση"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Διεύθυνση"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr "Η ταχυδρομική διεύθυνση της Τοποθέτησης"
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr "Αριθμός τηλεφώνου για αυτή την Τοποθέτηση"
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr "Ο αριθμός φαξ για αυτή την Εγκατάσταση"
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr "Ιδιότητες SUPANN"
-
-#: 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 "Κωδικός SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr "Ο κωδικός SUPANN για αυτή την Εγκατάσταση"
-
-#: 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 "URI αρχικής σελίδας"
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr "Το URI της αρχικής σελίδας του ιστότοπου της Εγκατάστασης"
-
-#: 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 "Το URI του ιστότοπου της Εγκατάστασης"
-
-#: 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 "Το URI των λευκών σελίδων της Εγκατάστασης"
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Σφάλμα LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr "Σφάλμα αρχείου"
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr "Αδυναμία ανάγνωσης αρχείου: '%s'"
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -458,6 +227,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr "Εγκαθίδρυση"
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -648,3 +423,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr "Δομές Supann"
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr "Διαχείριση δομών Supann"
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr "Σφάλμα αρχείου"
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr "Αδυναμία ανάγνωσης αρχείου: '%s'"
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr "Ρυθμίσεις εγκαθίδρυση SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr "Εγκαθίδρυση SUPANN"
+
+#: 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 "Το όνομα που θα εγγράφεται στο γνώρισμα o για αυτή την Τοποθέτηση"
+
+#: 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 "Ιδιότητες SUPANN"
+
+#: 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 "Κωδικός SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr "Ο κωδικός SUPANN για αυτή την Εγκατάσταση"
+
+#: 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 "URI αρχικής σελίδας"
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr "Το URI της αρχικής σελίδας του ιστότοπου της Εγκατάστασης"
+
+#: 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 "Το URI του ιστότοπου της Εγκατάστασης"
+
+#: 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 "Το URI των λευκών σελίδων της Εγκατάστασης"
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Σφάλμα LDAP"
+
+#: 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 "Ρυθμίσεις οντότητας SUPANN"
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr "Οντότητα SUPANN"
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr "Το όνομα που θα εγγράφεται στο γνώρισμα ou για αυτή την οντότητα"
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative informations"
+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 informations"
+msgstr "Πληροφορίες SUPANN"
+
+#: 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 "Ο βέλτιστος τύπος SUPANN που ταιριάζει σε αυτή την οντότητα"
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr "Κωδικός οντότητα"
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr "Ο κωδικός SUPANN για αυτή την οντότητα"
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr "Γονική οντότητα"
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr "Η γονική οντότητα αυτής της οντότητας"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr "ID αναφοράς"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr "ID αναφοράς του SUPANN για αυτή την οντότητα"
diff --git a/supann/locale/es/fusiondirectory.po b/supann/locale/es/fusiondirectory.po
index e35ca23d46..98df399c38 100644
--- a/supann/locale/es/fusiondirectory.po
+++ b/supann/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Teléfono"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Código Postal"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Propiedades"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Localización"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Dirección"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Propiedades"
+
+#: 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 "Nombre"
+
+#: 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 "Descripción"
+
+#: 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 "Localización"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Dirección"
+
+#: 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 "Teléfono"
+
+#: 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 "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Error LDAP"
+
+#: 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 informations"
+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 "Código Postal"
+
+#: 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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/es_CO/fusiondirectory.po b/supann/locale/es_CO/fusiondirectory.po
index 3c16bd121f..36d8eb3052 100644
--- a/supann/locale/es_CO/fusiondirectory.po
+++ b/supann/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Propiedades"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Ubicación"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Dirección"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Propiedades"
+
+#: 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 "Nombre"
+
+#: 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 "Descripción"
+
+#: 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 "Ubicación"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Dirección"
+
+#: 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 "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Error LDAP"
+
+#: 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 informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/es_VE/fusiondirectory.po b/supann/locale/es_VE/fusiondirectory.po
index 6455e72950..31fdeb3368 100644
--- a/supann/locale/es_VE/fusiondirectory.po
+++ b/supann/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Teléfono"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Código Postal"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Propiedades"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Localización"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Dirección"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Error de LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Propiedades"
+
+#: 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 "Nombre"
+
+#: 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 "Descripción"
+
+#: 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 "Localización"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Dirección"
+
+#: 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 "Teléfono"
+
+#: 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 "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Error de LDAP"
+
+#: 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 informations"
+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 "Código Postal"
+
+#: 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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/fa_IR/fusiondirectory.po b/supann/locale/fa_IR/fusiondirectory.po
index f093af0015..44d6200678 100644
--- a/supann/locale/fa_IR/fusiondirectory.po
+++ b/supann/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "آدرس"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "خطای LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "آدرس"
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "خطای LDAP"
+
+#: 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 informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/fi_FI/fusiondirectory.po b/supann/locale/fi_FI/fusiondirectory.po
index 239fb6967d..c287a9051a 100644
--- a/supann/locale/fi_FI/fusiondirectory.po
+++ b/supann/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Nimi"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Faksi"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Kuvaus"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Ominaisuudet"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Osoite"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "LDAP virhe"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Ominaisuudet"
+
+#: 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 "Nimi"
+
+#: 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 "Kuvaus"
+
+#: 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 "Osoite"
+
+#: 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 "Faksi"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "LDAP virhe"
+
+#: 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 informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/fr/fusiondirectory.po b/supann/locale/fr/fusiondirectory.po
index 079afbabbb..c03ed7e8d5 100644
--- a/supann/locale/fr/fusiondirectory.po
+++ b/supann/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -19,237 +19,6 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr "Structures SUPANN"
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr "Gestion des structures SUPANN"
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr "Entité"
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr "Paramètres de l’entité SUPANN"
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr "Entité SUPANN"
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Nom"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr "Nom à écrire dans l'attribut 'ou' pour cette entité"
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr "Informations administratives"
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Téléphone"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr "Numéro de téléphone pour cette entité"
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr "Numéro de fax pour cette entité"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Adresse postale"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr "Adresse postale de cette entité"
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Description"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr "Courte description de cette entité"
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr "Informations SUPANN"
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr "Type d’entité"
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr "Le type SUPANN qui correspond le mieux à cette entité"
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr "Code entité"
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr "Le code SUPANN de cette entité"
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr "Entité parente"
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr "L’entité parente de cette entité"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr "Identifiant de référence"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr "L’identifiant de référence SUPANN de cette entité"
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr "Établissement"
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr "Paramètres de l'établissement SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr "Établissement SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Propriétés"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr "Établissement racine"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr "Définit cette établissement comme établissement racine"
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr "Nom à écrire dans l'attribut 'o' pour cet établissement"
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr "Courte description de cette établissement"
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Lieu"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr "Habituellement la ville où se situe l’établissement"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Adresse"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr "L’adresse postale de l’établissement"
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr "Le numéro de téléphone de l’établissement"
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr "Le numéro de fax de l’établissement"
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr "Propriétés SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr "Code établissement"
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr "Le code de cet établissement (doit avoir un préfixe entre { })"
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr "Code SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr "Le code SUPANN de cet établissement"
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr "Nom officiel"
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr "Le nom légal de cet établissement"
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr "Site web officiel"
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr "L’URI du site web de cet établissement"
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr "Site web de l'institution"
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr "L’URI du site web de l’institution de cet établissement"
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr "Annuaire pages blanches"
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr "L’URI des pages blanches de cet établissement"
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Erreur LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr "Erreur de fichier"
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr "Impossible de lire le fichier : '%s'"
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -458,6 +227,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr "eduPersonAffiliation - statut de la personne : étudiant, BIATOSS, enseignant, sous contrat, retraité, personnel hébergé (CNRS, INSERM, etc.), un ancien étudiant, etc."
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr "Établissement"
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -648,3 +423,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr "Autoriser les utilisateurs à utiliser leur adresse de courriel SUPANN personnelle pour la récupération de leur mot de passe"
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr "Structures SUPANN"
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr "Gestion des structures SUPANN"
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr "Erreur de fichier"
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr "Impossible de lire le fichier : '%s'"
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr "Paramètres de l'établissement SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr "Établissement SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Propriétés"
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr "Établissement racine"
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr "Définit cette établissement comme établissement racine"
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr "Nom"
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr "Nom à écrire dans l'attribut 'o' pour cet établissement"
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr "Description"
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr "Courte description de cette établissement"
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr "Lieu"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr "Habituellement la ville où se situe l’établissement"
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Adresse"
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr "L’adresse postale de l’établissement"
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr "Téléphone"
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr "Le numéro de téléphone de l’établissement"
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr "Le numéro de fax de l’établissement"
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr "Propriétés SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr "Code établissement"
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr "Le code de cet établissement (doit avoir un préfixe entre { })"
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr "Code SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr "Le code SUPANN de cet établissement"
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr "Nom officiel"
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr "Le nom légal de cet établissement"
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr "Site web officiel"
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr "L’URI du site web de cet établissement"
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr "Site web de l'institution"
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr "L’URI du site web de l’institution de cet établissement"
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr "Annuaire pages blanches"
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr "L’URI des pages blanches de cet établissement"
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Erreur LDAP"
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr "Entité"
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr "Paramètres de l’entité SUPANN"
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr "Entité SUPANN"
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr "Nom à écrire dans l'attribut 'ou' pour cette entité"
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative informations"
+msgstr "Informations administratives"
+
+#: admin/supannStructures/class_entite.inc:64
+msgid "Phone number for this entity"
+msgstr "Numéro de téléphone pour cette entité"
+
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax number for this entity"
+msgstr "Numéro de fax pour cette entité"
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address"
+msgstr "Adresse postale"
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address of this entity"
+msgstr "Adresse postale de cette entité"
+
+#: admin/supannStructures/class_entite.inc:76
+msgid "Short description of this entity"
+msgstr "Courte description de cette entité"
+
+#: admin/supannStructures/class_entite.inc:82
+msgid "SUPANN informations"
+msgstr "Informations SUPANN"
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr "Type d’entité"
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr "Le type SUPANN qui correspond le mieux à cette entité"
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr "Code entité"
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr "Le code SUPANN de cette entité"
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr "Entité parente"
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr "L’entité parente de cette entité"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr "Identifiant de référence"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr "L’identifiant de référence SUPANN de cette entité"
diff --git a/supann/locale/hu_HU/fusiondirectory.po b/supann/locale/hu_HU/fusiondirectory.po
index 687b066f7b..2b1ec6170f 100644
--- a/supann/locale/hu_HU/fusiondirectory.po
+++ b/supann/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Név"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Leírás"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr "Név"
+
+#: 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 "Leírás"
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/id/fusiondirectory.po b/supann/locale/id/fusiondirectory.po
index 3264d28e97..44429e2626 100644
--- a/supann/locale/id/fusiondirectory.po
+++ b/supann/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/it_IT/fusiondirectory.po b/supann/locale/it_IT/fusiondirectory.po
index 58ec94d4c5..d3de1b9803 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:29+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -18,237 +18,6 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr "Strutture supann"
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr "Gestione delle strutture supann"
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr "Entità"
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr "Impostazioni Entità SUPANN"
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr "Entità SUPANN"
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Nome"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr "Nome da scrivere nell'attributo di questa entità"
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr "Informazioni amministrative"
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Telefono"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr "Numero di telefono di questa entità"
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr "Numero di fax di questa entità"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Indirizzo postale"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr "Indirizzo postale di questa entità"
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Descrizione"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr "Breve descrizione di questa entità"
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr "Informazioni SUPANN"
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr "Tipo di entità"
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr "Il miglior tipo SUPANN che va bene per questa entità"
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr "Tipo di entità"
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr "Codice SUPANN di questa entità"
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr "Nodo genitore"
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr "Nodo genitore di questa Entità"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr "Referenza ID"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr "Referenza ID SUPANN di questa entità"
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr "Immobile"
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr "Impostazioni SUPANN dell'immobile"
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr "Immobile SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Proprietà"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr "Radice dell'immobile"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr "Impostare questo stabilimento come quello di root"
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr "Nome da scrivere nell'attributo di questo immobile"
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr "Breve descrizione di questo immobile"
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Località"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr "Città in cui é situato questo immobile"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Indirizzo"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr "Indirizzo postale di questo immobile"
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr "Numero di telefono di questo immobile"
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr "Numero di fax di questo immobile"
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr "Proprietà SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr "Codice dell'immobile"
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr "Il codice di questo immobile (deve avere un prefisso tra {}) "
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr "Codice SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr "Il codice SUPANN per questo immobile"
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr "Nome legale"
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr "Entità legale dell'immobile"
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr "URI della home page"
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr "L'URI della home page di questo immobile"
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr "Istituzione URI"
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr "L'URI del sito web dell'istituzione dello Stabilimento"
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr "Pagine bianche URI"
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr "L'URI delle pagine bianche di questo immobile"
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Errore LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr "Errore"
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr "Impossibile leggere il file : %s"
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -457,6 +226,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr "eduPersonAffiliation - Statuto della persona: studente, BIATOSS, insegnante, contractor, pensionato, personale ospitato (CERN, INSERM, ecc.), un ex studente, ecc."
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr "Immobile"
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -647,3 +422,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr "Consentire l'uso di indirizzi di posta elettronica dal campo mail personali da conto SUPANN per il recupero della password"
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr "Strutture supann"
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr "Gestione delle strutture supann"
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr "Errore"
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr "Impossibile leggere il file : %s"
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr "Impostazioni SUPANN dell'immobile"
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr "Immobile SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Proprietà"
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr "Radice dell'immobile"
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr "Impostare questo stabilimento come quello di root"
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr "Nome"
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr "Nome da scrivere nell'attributo di questo immobile"
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr "Descrizione"
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr "Breve descrizione di questo immobile"
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr "Località"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr "Città in cui é situato questo immobile"
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Indirizzo"
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr "Indirizzo postale di questo immobile"
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr "Telefono"
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr "Numero di telefono di questo immobile"
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr "Numero di fax di questo immobile"
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr "Proprietà SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr "Codice dell'immobile"
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr "Il codice di questo immobile (deve avere un prefisso tra {}) "
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr "Codice SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr "Il codice SUPANN per questo immobile"
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr "Nome legale"
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr "Entità legale dell'immobile"
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr "URI della home page"
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr "L'URI della home page di questo immobile"
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr "Istituzione URI"
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr "L'URI del sito web dell'istituzione dello Stabilimento"
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr "Pagine bianche URI"
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr "L'URI delle pagine bianche di questo immobile"
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Errore LDAP"
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr "Entità"
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr "Impostazioni Entità SUPANN"
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr "Entità SUPANN"
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr "Nome da scrivere nell'attributo di questa entità"
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative informations"
+msgstr "Informazioni amministrative"
+
+#: admin/supannStructures/class_entite.inc:64
+msgid "Phone number for this entity"
+msgstr "Numero di telefono di questa entità"
+
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax number for this entity"
+msgstr "Numero di fax di questa entità"
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address"
+msgstr "Indirizzo postale"
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address of this entity"
+msgstr "Indirizzo postale di questa entità"
+
+#: admin/supannStructures/class_entite.inc:76
+msgid "Short description of this entity"
+msgstr "Breve descrizione di questa entità"
+
+#: admin/supannStructures/class_entite.inc:82
+msgid "SUPANN informations"
+msgstr "Informazioni SUPANN"
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr "Tipo di entità"
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr "Il miglior tipo SUPANN che va bene per questa entità"
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr "Tipo di entità"
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr "Codice SUPANN di questa entità"
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr "Nodo genitore"
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr "Nodo genitore di questa Entità"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr "Referenza ID"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr "Referenza ID SUPANN di questa entità"
diff --git a/supann/locale/lv/fusiondirectory.po b/supann/locale/lv/fusiondirectory.po
index a3bbc57c1e..3206c61dcb 100644
--- a/supann/locale/lv/fusiondirectory.po
+++ b/supann/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Vārds "
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fakss"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Pasta adrese"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Apraksts"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Atrašanās vieta"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Adrese"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "LDAP kļūda"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr "Vārds "
+
+#: 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 "Apraksts"
+
+#: 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 "Atrašanās vieta"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Adrese"
+
+#: 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 "Fakss"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "LDAP kļūda"
+
+#: 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 informations"
+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 "Pasta adrese"
+
+#: 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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/nb/fusiondirectory.po b/supann/locale/nb/fusiondirectory.po
index 62ac6c8fd1..9ffbe92c53 100644
--- a/supann/locale/nb/fusiondirectory.po
+++ b/supann/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Navn"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "LDAP-feil"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: 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 "Navn"
+
+#: 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 "Beskrivelse"
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "LDAP-feil"
+
+#: 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 informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/nl/fusiondirectory.po b/supann/locale/nl/fusiondirectory.po
index c6d27a44e8..815774513e 100644
--- a/supann/locale/nl/fusiondirectory.po
+++ b/supann/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Naam"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Telefoon"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Postadres"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Omschrijving"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Plaats"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Adres"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "LDAP fout"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#: 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 "Naam"
+
+#: 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 "Omschrijving"
+
+#: 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 "Plaats"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Adres"
+
+#: 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 "Telefoon"
+
+#: 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 "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "LDAP fout"
+
+#: 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 informations"
+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 "Postadres"
+
+#: 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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/pl/fusiondirectory.po b/supann/locale/pl/fusiondirectory.po
index 0991d1e96c..84bb6e9b33 100644
--- a/supann/locale/pl/fusiondirectory.po
+++ b/supann/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Telefon"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Adres pocztowy"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Opis"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Właściwości"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Lokalizacja"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Adres"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "błąd LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Właściwości"
+
+#: 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 "ImiÄ™"
+
+#: 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 "Opis"
+
+#: 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 "Lokalizacja"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Adres"
+
+#: 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 "Telefon"
+
+#: 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 "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "błąd LDAP"
+
+#: 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 informations"
+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 "Adres pocztowy"
+
+#: 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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/pt/fusiondirectory.po b/supann/locale/pt/fusiondirectory.po
index 298240f56f..164b3f66ea 100644
--- a/supann/locale/pt/fusiondirectory.po
+++ b/supann/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Nome"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Caixa postal"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Descrição"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Propriedades"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Localização"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Endereço"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Propriedades"
+
+#: 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 "Nome"
+
+#: 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 "Descrição"
+
+#: 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 "Localização"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Endereço"
+
+#: 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 "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
+#: 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 informations"
+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 "Caixa postal"
+
+#: 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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/pt_BR/fusiondirectory.po b/supann/locale/pt_BR/fusiondirectory.po
index af3f9f1e95..0321a56aa4 100644
--- a/supann/locale/pt_BR/fusiondirectory.po
+++ b/supann/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr "Estruturas Supann"
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr "Gerenciador de estruturas Supann"
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Nome"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr "Informações administrativas"
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Telefone"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Endereços de correspondência"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Descrição"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr "Informações de SUPANN"
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr "ID de referência"
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Propriedades"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Localização"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Endereço"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr "Propriedades SUPANN"
-
-#: 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 "Código SUPANN"
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr "Nome legal"
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr "Estruturas Supann"
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr "Gerenciador de estruturas Supann"
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Propriedades"
+
+#: 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 "Nome"
+
+#: 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 "Descrição"
+
+#: 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 "Localização"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Endereço"
+
+#: 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 "Telefone"
+
+#: 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 "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr "Propriedades SUPANN"
+
+#: 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 "Código SUPANN"
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr "Nome legal"
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
+#: 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 informations"
+msgstr "Informações administrativas"
+
+#: 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 "Endereços de correspondência"
+
+#: 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 informations"
+msgstr "Informações de SUPANN"
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr "ID de referência"
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/ru/fusiondirectory.po b/supann/locale/ru/fusiondirectory.po
index 10bdcb7186..ed7690c02f 100644
--- a/supann/locale/ru/fusiondirectory.po
+++ b/supann/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,237 +17,6 @@ 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/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Фамилия"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Телефон"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Факс"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Почтовый адрес"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Описание"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Свойства"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Местоположение"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Адрес"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Ошибка LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Свойства"
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr "Фамилия"
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr "Описание"
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr "Местоположение"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Адрес"
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr "Телефон"
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr "Факс"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Ошибка LDAP"
+
+#: 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 informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/ru@petr1708/fusiondirectory.po b/supann/locale/ru@petr1708/fusiondirectory.po
index 7c748591f1..da33ba3f4e 100644
--- a/supann/locale/ru@petr1708/fusiondirectory.po
+++ b/supann/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,237 +17,6 @@ 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/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/sv/fusiondirectory.po b/supann/locale/sv/fusiondirectory.po
index 5841f53b41..d6f88147a3 100644
--- a/supann/locale/sv/fusiondirectory.po
+++ b/supann/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Namn"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Telefon"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Postadress"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Beskrivning"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Plats"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Adress"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "LDAP-fel"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: 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 "Namn"
+
+#: 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 "Beskrivning"
+
+#: 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 "Plats"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Adress"
+
+#: 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 "Telefon"
+
+#: 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 "Fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "LDAP-fel"
+
+#: 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 informations"
+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 "Postadress"
+
+#: 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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/ug/fusiondirectory.po b/supann/locale/ug/fusiondirectory.po
index c0dc4826b9..93e8818310 100644
--- a/supann/locale/ug/fusiondirectory.po
+++ b/supann/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:03+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/vi_VN/fusiondirectory.po b/supann/locale/vi_VN/fusiondirectory.po
index e1a14450fd..605bf91aad 100644
--- a/supann/locale/vi_VN/fusiondirectory.po
+++ b/supann/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "Tên"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "Số điện thoại"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "Số fax"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "Địa chỉ theo bưu điện"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "Mô tả"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "Properties"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "Vị trí"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "Địa chỉ"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "Lá»—i LDAP"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "Properties"
+
+#: 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 "Tên"
+
+#: 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 "Mô tả"
+
+#: 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 "Vị trí"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "Địa chỉ"
+
+#: 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 "Số điện thoại"
+
+#: 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 "Số fax"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "Lá»—i LDAP"
+
+#: 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 informations"
+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 "Địa chỉ theo bưu điện"
+
+#: 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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/supann/locale/zh/fusiondirectory.po b/supann/locale/zh/fusiondirectory.po
index 49efe17366..7b3c4a3861 100644
--- a/supann/locale/zh/fusiondirectory.po
+++ b/supann/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,237 +17,6 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/supannStructures/class_supannStructuresManagement.inc:35
-msgid "Supann structures"
-msgstr ""
-
-#: admin/supannStructures/class_supannStructuresManagement.inc:36
-msgid "Supann structures management"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:31
-#: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:55
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "Name"
-msgstr "名称"
-
-#: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:61
-msgid "Administrative informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:64
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Telephone"
-msgstr "电话"
-
-#: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:68
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax"
-msgstr "传真"
-
-#: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address"
-msgstr "地址"
-
-#: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:76
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "Description"
-msgstr "描述"
-
-#: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:82
-msgid "SUPANN informations"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "Reference ID"
-msgstr ""
-
-#: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
-msgid "Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:52
-msgid "Properties"
-msgstr "属性"
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:69
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Location"
-msgstr "位置"
-
-#: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "Address"
-msgstr "住址"
-
-#: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:90
-msgid "SUPANN properties"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "SUPANN code"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "Legal name"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "Home page URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "Institution URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "White pages URI"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr ""
-
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
-msgid "LDAP error"
-msgstr "LDAP 错误"
-
-#: admin/supannStructures/class_supann.inc:53
-msgid "File error"
-msgstr ""
-
-#: admin/supannStructures/class_supann.inc:54
-#, php-format
-msgid "Cannot read file: '%s'"
-msgstr ""
-
 #: personal/supann/class_supannAccount.inc:36
 #: personal/supann/class_supannAccount.inc:111
 msgid "None"
@@ -456,6 +225,12 @@ msgid ""
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
+#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:365
+#: admin/supannStructures/class_etablissement.inc:31
+msgid "Establishment"
+msgstr ""
+
 #: personal/supann/class_supannAccount.inc:326
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
@@ -646,3 +421,228 @@ msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
 msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr "属性"
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr "名称"
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr "描述"
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr "位置"
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr "住址"
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr "电话"
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr "传真"
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:149
+#: admin/supannStructures/class_etablissement.inc:200
+#: admin/supannStructures/class_etablissement.inc:214
+msgid "LDAP error"
+msgstr "LDAP 错误"
+
+#: 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 informations"
+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 informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entity"
+msgstr ""
diff --git a/sympa/locale/ar/fusiondirectory.po b/sympa/locale/ar/fusiondirectory.po
index c4eba37b3e..24a2d18785 100644
--- a/sympa/locale/ar/fusiondirectory.po
+++ b/sympa/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/sympa/locale/ca/fusiondirectory.po b/sympa/locale/ca/fusiondirectory.po
index 47716be33d..184cebc045 100644
--- a/sympa/locale/ca/fusiondirectory.po
+++ b/sympa/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/sympa/locale/cs_CZ/fusiondirectory.po b/sympa/locale/cs_CZ/fusiondirectory.po
index 17cb27ea38..e6447a6929 100644
--- a/sympa/locale/cs_CZ/fusiondirectory.po
+++ b/sympa/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/sympa/locale/de/fusiondirectory.po b/sympa/locale/de/fusiondirectory.po
index 7a42b09aa3..a323336ad3 100644
--- a/sympa/locale/de/fusiondirectory.po
+++ b/sympa/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/sympa/locale/el_GR/fusiondirectory.po b/sympa/locale/el_GR/fusiondirectory.po
index 21baac69eb..6d6a3e9861 100644
--- a/sympa/locale/el_GR/fusiondirectory.po
+++ b/sympa/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/sympa/locale/es/fusiondirectory.po b/sympa/locale/es/fusiondirectory.po
index 0aabf69372..6e196f737c 100644
--- a/sympa/locale/es/fusiondirectory.po
+++ b/sympa/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/sympa/locale/es_CO/fusiondirectory.po b/sympa/locale/es_CO/fusiondirectory.po
index 4e74e1c514..9fd652b6b7 100644
--- a/sympa/locale/es_CO/fusiondirectory.po
+++ b/sympa/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/sympa/locale/es_VE/fusiondirectory.po b/sympa/locale/es_VE/fusiondirectory.po
index 88b5db12eb..8c159400e7 100644
--- a/sympa/locale/es_VE/fusiondirectory.po
+++ b/sympa/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/sympa/locale/fa_IR/fusiondirectory.po b/sympa/locale/fa_IR/fusiondirectory.po
index ceb22cf4db..8bd86c5bb7 100644
--- a/sympa/locale/fa_IR/fusiondirectory.po
+++ b/sympa/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/sympa/locale/fi_FI/fusiondirectory.po b/sympa/locale/fi_FI/fusiondirectory.po
index 5c0e155b2e..9d2769fa1d 100644
--- a/sympa/locale/fi_FI/fusiondirectory.po
+++ b/sympa/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/sympa/locale/fr/fusiondirectory.po b/sympa/locale/fr/fusiondirectory.po
index d504c9a75f..04161aad62 100644
--- a/sympa/locale/fr/fusiondirectory.po
+++ b/sympa/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/sympa/locale/hu_HU/fusiondirectory.po b/sympa/locale/hu_HU/fusiondirectory.po
index 989e0cf947..517ce100e1 100644
--- a/sympa/locale/hu_HU/fusiondirectory.po
+++ b/sympa/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/sympa/locale/id/fusiondirectory.po b/sympa/locale/id/fusiondirectory.po
index 200d921526..1bd009fab1 100644
--- a/sympa/locale/id/fusiondirectory.po
+++ b/sympa/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/sympa/locale/it_IT/fusiondirectory.po b/sympa/locale/it_IT/fusiondirectory.po
index c90bbed8a4..b76686188c 100644
--- a/sympa/locale/it_IT/fusiondirectory.po
+++ b/sympa/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/sympa/locale/lv/fusiondirectory.po b/sympa/locale/lv/fusiondirectory.po
index 96254bf71c..4b769f2a69 100644
--- a/sympa/locale/lv/fusiondirectory.po
+++ b/sympa/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/sympa/locale/nb/fusiondirectory.po b/sympa/locale/nb/fusiondirectory.po
index df23eccadb..3f20348b9a 100644
--- a/sympa/locale/nb/fusiondirectory.po
+++ b/sympa/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/sympa/locale/nl/fusiondirectory.po b/sympa/locale/nl/fusiondirectory.po
index dd14854b41..0fbe33712c 100644
--- a/sympa/locale/nl/fusiondirectory.po
+++ b/sympa/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/sympa/locale/pl/fusiondirectory.po b/sympa/locale/pl/fusiondirectory.po
index 8c902111a7..929aef6648 100644
--- a/sympa/locale/pl/fusiondirectory.po
+++ b/sympa/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/sympa/locale/pt/fusiondirectory.po b/sympa/locale/pt/fusiondirectory.po
index 71ef1f6f76..51d134bfc6 100644
--- a/sympa/locale/pt/fusiondirectory.po
+++ b/sympa/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/sympa/locale/pt_BR/fusiondirectory.po b/sympa/locale/pt_BR/fusiondirectory.po
index 8bbf6ddd8f..a555500713 100644
--- a/sympa/locale/pt_BR/fusiondirectory.po
+++ b/sympa/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/sympa/locale/ru/fusiondirectory.po b/sympa/locale/ru/fusiondirectory.po
index e6eb41796f..2228a1aa2e 100644
--- a/sympa/locale/ru/fusiondirectory.po
+++ b/sympa/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-08 09:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/sympa/locale/ru@petr1708/fusiondirectory.po b/sympa/locale/ru@petr1708/fusiondirectory.po
index a8247b36da..fa0aaad742 100644
--- a/sympa/locale/ru@petr1708/fusiondirectory.po
+++ b/sympa/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/sympa/locale/sv/fusiondirectory.po b/sympa/locale/sv/fusiondirectory.po
index 50a92c05e2..a8459284da 100644
--- a/sympa/locale/sv/fusiondirectory.po
+++ b/sympa/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/sympa/locale/ug/fusiondirectory.po b/sympa/locale/ug/fusiondirectory.po
index 1400727c57..e1d7200039 100644
--- a/sympa/locale/ug/fusiondirectory.po
+++ b/sympa/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:04+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/sympa/locale/vi_VN/fusiondirectory.po b/sympa/locale/vi_VN/fusiondirectory.po
index 55b118fcc4..5fc40c15a0 100644
--- a/sympa/locale/vi_VN/fusiondirectory.po
+++ b/sympa/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/sympa/locale/zh/fusiondirectory.po b/sympa/locale/zh/fusiondirectory.po
index d3487e6dc0..e18d75d5fe 100644
--- a/sympa/locale/zh/fusiondirectory.po
+++ b/sympa/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/systems/locale/ar/fusiondirectory.po b/systems/locale/ar/fusiondirectory.po
index 76cfafe5a8..49f26d36e8 100644
--- a/systems/locale/ar/fusiondirectory.po
+++ b/systems/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ 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"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "أنظمة"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "خادم"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr ""
 
@@ -125,635 +288,358 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "خادم"
+
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "خادم"
+
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "الوصف"
+
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "البداية"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "إزالة"
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "قائمة الأنظمة"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr "البداية"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "خادم"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
+msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "طابعة"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "الهاتف"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
 msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "الإسم"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "الوصف"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "خدمات"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr ""
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr ""
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr ""
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "إزالة"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "الخواص"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "الإسم"
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "الهاتف"
 
-#: admin/systems/class_phoneGeneric.inc:73
 #: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
 #: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "خطأ"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "معلومات"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "خادم"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "خادم"
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "البداية"
+
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "خدمات"
+
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "خطأ"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "معلومات"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
-msgstr "البداية"
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "أنظمة"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
-msgstr "تحكم الأنظمة"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
+msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
@@ -941,179 +827,316 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "قائمة الأنظمة"
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "طابعة"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
-msgid "IP address %s"
+msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
-msgstr ""
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
+msgstr "تحكم الأنظمة"
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
-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] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: 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] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1176,6 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1187,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,38 +1230,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
diff --git a/systems/locale/ca/fusiondirectory.po b/systems/locale/ca/fusiondirectory.po
index 250d3fb70b..f5e619a6f9 100644
--- a/systems/locale/ca/fusiondirectory.po
+++ b/systems/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
@@ -125,495 +288,140 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Telèfon"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Nom"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr ""
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
-msgid "Release"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr ""
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Localització"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Informació"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Intèrpret d'ordres"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
-msgstr ""
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Nom"
 
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
@@ -623,6 +431,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr ""
@@ -631,8 +446,21 @@ msgstr ""
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telèfon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
 msgstr ""
 
 #: admin/systems/class_mobilePhoneGeneric.inc:77
@@ -659,6 +487,11 @@ msgstr ""
 msgid "SimCard"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr ""
@@ -671,88 +504,141 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Error"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Informació"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:152
 #, php-format
-msgid "System %s is currently installing"
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Localització"
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "Inherited from %s"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:72
+#, php-format
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:116
+#, php-format
+msgid "No DHCP server found for ip %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:130
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,179 +827,308 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
 #, php-format
-msgid "IP address %s"
+msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Intèrpret d'ordres"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1168,6 @@ msgstr ""
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,30 +1222,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/cs_CZ/fusiondirectory.po b/systems/locale/cs_CZ/fusiondirectory.po
index e1243c9f3d..fb6a9f10fe 100644
--- a/systems/locale/cs_CZ/fusiondirectory.po
+++ b/systems/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr "Síť"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr "Statistiky a různé další údaje"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr "DHCP"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr "DNS"
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Systémy"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations about systems"
+msgstr "Statistiky a informace o systémech"
+
+#: addons/dashboard/class_dashBoardSystems.inc:43
+msgid "Statistics"
+msgstr "Statistiky"
+
+#: addons/dashboard/class_dashBoardSystems.inc:48
+msgid "Computer name to use by unit"
+msgstr "Název počítače, určeného pro použití touto jednotkou"
+
+#: addons/dashboard/class_dashBoardSystems.inc:74
+msgid "Workstations"
+msgstr "Pracovní stanice"
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Servery"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr "Pracovní stanice s MS Windows"
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr "Terminály"
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr "Tiskárny"
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr "Telefony"
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr "Součásti"
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+msgstr "Mobilní telefony"
+
+#: config/systems/class_systemsPluginConfig.inc:29
+msgid "Systems plugin configuration"
+msgstr "Nastavení zásuvného modulu Systémy"
+
+#: config/systems/class_systemsPluginConfig.inc:40
+msgid "LDAP tree for systems"
+msgstr "LDAP strom pro systémy"
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Systems RDN"
+msgstr "Relativní rozlišený název systémů"
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Branch in which systems will be stored"
+msgstr "Větev, ve které budou uloženy systémy"
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Server RDN"
+msgstr "Relativní rozlišený název serveru"
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Branch in which servers will be stored"
+msgstr "Větev, ve které budou uloženy servery"
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Workstations RDN"
+msgstr "Relativní rozlišený název počítačů"
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Branch in which workstations will be stored"
+msgstr "Větev, ve které budou uloženy počítače"
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Terminal RDN"
+msgstr "Rozlišený název terminálu"
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Branch in which terminals will be stored"
+msgstr "Větev, ve které budou uloženy terminály"
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Printer RDN"
+msgstr "Rozlišený název tiskárny"
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Branch in which printers will be stored"
+msgstr "Větev, ve které budou uloženy tiskárny"
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Component RDN"
+msgstr "Relativní rozlišený název komponenty"
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Branch in which network devices will be stored"
+msgstr "Větev, ve které budou uložena síťová zařízení"
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Phone RDN"
+msgstr "Relativní rozlišený název telefonu"
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Branch in which phones will be stored"
+msgstr "Větev ve které budou telefony ukládány"
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Mobile phone RDN"
+msgstr "Relativní rozlišený název mobilního telefonu"
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Branch in which mobile phones will be stored"
+msgstr "Větev, ve které budou uloženy mobilní telefony"
+
+#: config/systems/class_systemsPluginConfig.inc:85
+msgid "Miscellaneous"
+msgstr "Různé"
+
+#: config/systems/class_systemsPluginConfig.inc:89
+msgid "Available encodings for share services"
+msgstr "Dostupná kódování znaků pro služby sdílení"
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "Encoding"
+msgstr "Znaková sada"
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "The encoding code name"
+msgstr "Název tohoto kódování znaků"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "Label"
+msgstr "Štítek"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
+msgstr "Zobrazovaný název tohoto kódování znaků"
+
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
+msgstr "Znakové sady"
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr "Zapnuto"
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr "Analýza systému"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Chyba LDAP"
 
@@ -125,496 +288,141 @@ msgstr "Kořenový server"
 msgid "Swap server"
 msgstr "Server pro odkládání paměti"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr "Parametry zavádění systému"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Server"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "zaváděné jádro"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
+msgstr "Informace o serveru"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Jádro Linux, které má být nainstalováno a zavedeno"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "server"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Parametry zavádění jádra"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr "Seznam služeb"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Parametry jádra Linux, se kterými má být zavedeno"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr "Služba"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Po spuštění"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr "!"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Spuštění terminálu"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Popis"
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Seznam systémů"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Akce"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Uzamčený server"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Vytvořit"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Uzamčený počítač"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Odstranit"
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Uzamčený terminál"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr "Zjistit stav"
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Pracovní stanice s MS Windows"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr "Spustit"
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr "Zastavit"
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Počítač"
-
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Terminál"
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Tiskárna"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Telefon"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr "Mobilní telefon"
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "Součást"
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Název"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr "IP adresa"
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr "MAC adresa"
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Popis"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Služby"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "Vydání"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Akce"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Vytvořit"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "Počítač s MS Windows"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Síťová tiskárna"
-
-#: admin/systems/system-list.xml:233
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Síťové zařízení"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "Mobilní telefon"
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr "Spustit akci"
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr "Naplánovat akci"
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Odstranit"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr "Upravit systém"
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr "Odstranit systém"
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr "Informace o počítači"
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr "Počítač"
-
-#: admin/systems/class_workstationGeneric.inc:148
-#: admin/systems/class_phoneGeneric.inc:56
-#: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr "Název %s"
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr "Stručný popis %s"
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Umístění"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr "Umístění %s"
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr "Uzamknout toto %s"
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr "Toto zabrání %s v tom, aby bylo opětovně nainstalováno"
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr "Nastavení sítě"
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr "Informace o telefonu"
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr "Jaký telefonní přístroj"
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr "Název telefonu"
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr "Stručný popis telefonu"
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr "Sériové číslo"
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr "Sériové číslo telefonu"
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr "Telefoní číslo"
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr "Telefonní číslo telefonu"
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr "Informace o tiskárně"
-
-#: 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 "Podrobnosti"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "Umístění tiskárny"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "URL adresa tiskárny"
-
-#: 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 "Uživatelé, kteří mohou používat tuto tiskárnu"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr "uživatelé, kteří smějí spravovat tuto tiskárnu"
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr "IP adresa"
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "MAC adresa"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr "Popis umístění v MS Windows"
-
-#: 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_serverService.inc:58
-msgid "Server services"
-msgstr "Služby serveru"
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Chyba"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Chyba filtru"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Filtr je neúplný!"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Informace"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr "Stav služby nelze aktualizovat dokud nebude uložena!"
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr "Nelze spustit akci %s na službě %s."
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr "Informace o terminálu"
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "terminál"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Servery"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr "Kořenový server, který by měl terminál používat"
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "Odkládací (swap) server, který by měl terminál používat"
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Vzdálená plocha"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Způsob připojování"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "žádné"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Terminálový server"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr "Restartovat"
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr "Nelze parsovat %s"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr "Upravit službu"
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr "Pro IP adresu %s nebyl nalezen žádný DHCP server"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr "Odebrat službu"
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_networkSettings.inc:242
 #, php-format
-msgid "No DNS server found for zone %s"
-msgstr "Pro zónu %s nebyl nalezen žádný DNS server"
+msgid "IP address %s"
+msgstr "IP adresa %s"
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "import(ovat)"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "IP adresa"
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr "Server, ze kterého chcete importovat hostitele"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "MAC adresa"
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr "Informace o serveru"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Nastavení sítě"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "server"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
+msgstr "Součást"
 
 #: admin/systems/class_componentGeneric.inc:37
 msgid "Component information"
 msgstr "Informace o součásti"
 
+#: admin/systems/class_componentGeneric.inc:41
+#: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
+msgid "Network device"
+msgstr "Síťové zařízení"
+
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_phoneGeneric.inc:56
+#: admin/systems/class_printGeneric.inc:58
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Název"
+
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
 msgstr "Název součásti"
@@ -623,6 +431,13 @@ msgstr "Název součásti"
 msgid "A short description of the component"
 msgstr "Stručný popis součásti"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr "Mobilní telefon"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr "Údaje o mobilním telefonu"
@@ -635,6 +450,19 @@ msgstr "Název mobilního telefonu"
 msgid "A short description of the mobile phone"
 msgstr "Stručný popis mobilního telefonu"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
+msgstr "Sériové číslo"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The serial number of the mobile phone"
 msgstr "Sériové číslo mobilního telefonu"
@@ -659,6 +487,11 @@ msgstr "Operační systém, nainstalovaný na tomto telefonu"
 msgid "SimCard"
 msgstr "SIM karta"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr "Telefoní číslo"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr "Telefoní číslo mobilního telefonu"
@@ -671,89 +504,142 @@ msgstr "Kód PUK"
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Kód PUK SIM karty v tomto mobilním telefonu"
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
-msgstr "Seznam služeb"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
+msgstr "Parametry zavádění systému"
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr "Služba"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "zaváděné jádro"
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
+msgstr "Jádro Linux, které má být nainstalováno a zavedeno"
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr "Zjistit stav"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
+msgstr "Parametry zavádění jádra"
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
-msgstr "Spustit"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
+msgstr "Parametry jádra Linux, se kterými má být zavedeno"
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "Zastavit"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Po spuštění"
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
-msgstr "Restartovat"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
+msgstr "Spuštění terminálu"
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr "Upravit službu"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Služby"
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr "Odebrat službu"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
+msgstr "Služby serveru"
+
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Chyba"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr "Chyba filtru"
+
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr "Filtr je neúplný!"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Informace"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr "Stav služby nelze aktualizovat dokud nebude uložena!"
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
+msgstr "Nelze spustit akci %s na službě %s."
+
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Počítač"
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr "Informace o počítači"
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr "Počítač"
+
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
+msgstr "Název %s"
+
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
+msgstr "Stručný popis %s"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Umístění"
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
-msgstr ""
+msgid "The location of the %s"
+msgstr "Umístění %s"
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
-msgstr ""
+msgid "Lock this %s"
+msgstr "Uzamknout toto %s"
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Oprávnění"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr "Toto zabrání %s v tom, aby bylo opětovně nainstalováno"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Nejste oprávněni pořídit zachycený stav %s."
+msgid "Could not parse %s"
+msgstr "Nelze parsovat %s"
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Nejste oprávněni obnovit zachycený stav %s."
+msgid "No DHCP server found for ip %s"
+msgstr "Pro IP adresu %s nebyl nalezen žádný DHCP server"
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
-msgstr "Převzato z %s"
+msgid "No DNS server found for zone %s"
+msgstr "Pro zónu %s nebyl nalezen žádný DNS server"
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Systémy"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "import(ovat)"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
-msgstr "Správa systémů"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
+msgstr "Server, ze kterého chcete importovat hostitele"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
@@ -941,178 +827,309 @@ msgstr "Určuje, zda kontrolovat, zda nebyla zrušena platnost certifikátu serv
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
-#, php-format
-msgid "IP address %s"
-msgstr "IP adresa %s"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Seznam systémů"
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr "Uzamčený server"
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr "Uzamčený počítač"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr "Uzamčený terminál"
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Pracovní stanice s MS Windows"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Terminál"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Tiskárna"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr "IP adresa"
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
 msgstr "MAC adresa"
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
-msgstr "Síť"
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "Vydání"
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
-msgstr "Nastavení DHCP"
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr "Počítač s MS Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
-msgstr "Statistiky a informace o systémech"
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "Síťová tiskárna"
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
-msgstr "Statistiky"
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr "Mobilní telefon"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
-msgstr "Název počítače, určeného pro použití touto jednotkou"
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr "Spustit akci"
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
-msgstr "Pracovní stanice"
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr "Naplánovat akci"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
-msgstr "Pracovní stanice s MS Windows"
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr "Upravit systém"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
-msgstr "Terminály"
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr "Odstranit systém"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
-msgstr "Tiskárny"
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr "Informace o telefonu"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
-msgstr "Telefony"
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr "Jaký telefonní přístroj"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
-msgstr "Součásti"
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr "Název telefonu"
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr "Stručný popis telefonu"
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr "Sériové číslo telefonu"
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr "Telefonní číslo telefonu"
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Oprávnění"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Nejste oprávněni pořídit zachycený stav %s."
+
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Nejste oprávněni obnovit zachycený stav %s."
+
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
+msgstr "Převzato z %s"
+
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
+msgstr "Správa systémů"
+
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
+msgstr "Informace o tiskárně"
+
+#: 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 "Podrobnosti"
+
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr "Umístění tiskárny"
+
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr "URL adresa tiskárny"
+
+#: 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 "Uživatelé, kteří mohou používat tuto tiskárnu"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
-msgstr "Mobilní telefony"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr "uživatelé, kteří smějí spravovat tuto tiskárnu"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Statistiky a různé další údaje"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
-msgstr "DHCP"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "MAC adresa"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
-msgstr "DNS"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
-msgstr "Nastavení zásuvného modulu Systémy"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
+msgstr "Popis umístění v MS Windows"
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
-msgstr "LDAP strom pro systémy"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
-msgstr "Relativní rozlišený název systémů"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
-msgstr "Větev, ve které budou uloženy systémy"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
-msgstr "Relativní rozlišený název serveru"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
-msgstr "Větev, ve které budou uloženy servery"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
-msgstr "Relativní rozlišený název počítačů"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
-msgstr "Větev, ve které budou uloženy počítače"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
+msgstr "Informace o terminálu"
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
-msgstr "Rozlišený název terminálu"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "terminál"
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
-msgstr "Větev, ve které budou uloženy terminály"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
+msgstr "Kořenový server, který by měl terminál používat"
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
-msgstr "Rozlišený název tiskárny"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
+msgstr "Odkládací (swap) server, který by měl terminál používat"
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
-msgstr "Větev, ve které budou uloženy tiskárny"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "Vzdálená plocha"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
-msgstr "Relativní rozlišený název komponenty"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "Způsob připojování"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
-msgstr "Větev, ve které budou uložena síťová zařízení"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "žádné"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
-msgstr "Relativní rozlišený název telefonu"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr "Větev ve které budou telefony ukládány"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
+msgstr "LDM"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr "Relativní rozlišený název mobilního telefonu"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "shell"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
-msgstr "Větev, ve které budou uloženy mobilní telefony"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
+msgstr "Telnet"
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Různé"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
-msgstr "Dostupná kódování znaků pro služby sdílení"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "Terminálový server"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
-msgstr "Znaková sada"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
+msgstr "Je zde hned několik argonaut serverů! (to zatím není podporováno)"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
-msgstr "Název tohoto kódování znaků"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+msgstr "Je zde argonaut server, provozovaný na %1 (%3://%2:%4)"
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-msgstr "Štítek"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] "Jen na jediném systému je nastavený argonaut klient."
+msgstr[1] "%1 systémy mají nastaveného argonaut klienta."
+msgstr[2] "%1 systémů má nastaveného argonaut klienta."
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
-msgstr "Zobrazovaný název tohoto kódování znaků"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
+msgstr "Ale žádný systém není nastaven pro provozování argonaut klienta!"
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-msgstr "Znakové sady"
+#: 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] "Systém má nastaveného argonaut klienta, ale není zde nastaven žádný argonaut server!"
+msgstr[1] "%1 systémy mají nastaveného argonaut klienta, ale není zde nastaven žádný argonaut server!"
+msgstr[2] "%1 systémů má nastaveného argonaut klienta, ale není zde nastaven žádný argonaut server!"
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1170,6 @@ msgstr "Spustit"
 msgid "Base"
 msgstr "Základ"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr "Nastavení  sítě"
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "IP adresa"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr "Navrhnout IP adresu"
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "MAC adresa"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr "Umožnit tomuto zařízení využívat DHCP"
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr "nenastaveno"
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr "Nadřazený uzel"
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr "Upravit nastavení"
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr "Varování : Jakmile importujete své OPSI stroje do FusionDirectory, budou zde spravovány. Takže, když je smažete či vypnete jejich OPSI panel, budou z OPSI odstraněny."
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1181,13 @@ msgstr "Toto se týká všech dat účtu, pravidel pro přístupy k systému, na
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Tedy – pokud jste si jisti, klikněte na Smazat. V opačném případě operaci zrušte kliknutím na Zrušit."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr "Varování : Jakmile importujete své OPSI stroje do FusionDirectory, budou zde spravovány. Takže, když je smažete či vypnete jejich OPSI panel, budou z OPSI odstraněny."
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtr"
@@ -1239,32 +1224,14 @@ msgstr "Zobrazit síťová zařízení"
 msgid "Show mobile phones"
 msgstr "Zobrazit mobilní telefony"
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr "Je zde hned několik argonaut serverů! (to zatím není podporováno)"
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr "Je zde argonaut server, provozovaný na %1 (%3://%2:%4)"
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] "Jen na jediném systému je nastavený argonaut klient."
-msgstr[1] "%1 systémy mají nastaveného argonaut klienta."
-msgstr[2] "%1 systémů má nastaveného argonaut klienta."
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "IP adresa"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr "Ale žádný systém není nastaven pro provozování argonaut klienta!"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
+msgstr "Navrhnout IP adresu"
 
-#: 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] "Systém má nastaveného argonaut klienta, ale není zde nastaven žádný argonaut server!"
-msgstr[1] "%1 systémy mají nastaveného argonaut klienta, ale není zde nastaven žádný argonaut server!"
-msgstr[2] "%1 systémů má nastaveného argonaut klienta, ale není zde nastaven žádný argonaut server!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "MAC adresa"
diff --git a/systems/locale/de/fusiondirectory.po b/systems/locale/de/fusiondirectory.po
index 9f76dcd9bb..2ff51bd77b 100644
--- a/systems/locale/de/fusiondirectory.po
+++ b/systems/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr "Netzwerk"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr "Statistiken und verschiedene Informationen"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr "DHCP"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr "DNS"
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Systeme"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations about systems"
+msgstr "Statistiken und Informationen über Systeme"
+
+#: addons/dashboard/class_dashBoardSystems.inc:43
+msgid "Statistics"
+msgstr "Statistiken"
+
+#: addons/dashboard/class_dashBoardSystems.inc:48
+msgid "Computer name to use by unit"
+msgstr "Computername, der von Einheit genutzt werden soll"
+
+#: addons/dashboard/class_dashBoardSystems.inc:74
+msgid "Workstations"
+msgstr "Arbeitsstationen"
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Server"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr "Windows Workstations"
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr "Terminals"
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr "Drucker"
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr "Telefone"
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr "Komponenten"
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+msgstr "Mobiltelefone"
+
+#: config/systems/class_systemsPluginConfig.inc:29
+msgid "Systems plugin configuration"
+msgstr "Systeme Plugin-Konfiguration"
+
+#: config/systems/class_systemsPluginConfig.inc:40
+msgid "LDAP tree for systems"
+msgstr "LDAP-Baum für Systeme"
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Systems RDN"
+msgstr "Systems RDN"
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Branch in which systems will be stored"
+msgstr "Zweig in welchem Systeme gespeichert werden"
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Server RDN"
+msgstr "Server RDN"
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Branch in which servers will be stored"
+msgstr "Zweig in welchem Server gespeichert werden"
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Workstations RDN"
+msgstr "Workstations RDN"
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Branch in which workstations will be stored"
+msgstr "Zweig in welchem Workstations gespeichert werden"
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Terminal RDN"
+msgstr "Terminal RDN"
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Branch in which terminals will be stored"
+msgstr "Zweig in welchem Terminals gespeichert werden"
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Printer RDN"
+msgstr "Drucker RDN"
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Branch in which printers will be stored"
+msgstr "Zweig in welchem Drucker gespeichert werden"
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Component RDN"
+msgstr "Komponenten RDN"
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Branch in which network devices will be stored"
+msgstr "Zweig in welchem Netzwerkgeräte gespeichert werden"
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Phone RDN"
+msgstr "Telefon RDN"
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Branch in which phones will be stored"
+msgstr "Zweig, in dem Telefone gespeichert werden"
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Mobile phone RDN"
+msgstr "Mobiltelefon RDN"
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Branch in which mobile phones will be stored"
+msgstr "Zweig in welchem Mobiltelefone gespeichert werden"
+
+#: config/systems/class_systemsPluginConfig.inc:85
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
+
+#: config/systems/class_systemsPluginConfig.inc:89
+msgid "Available encodings for share services"
+msgstr "Verfügbare Encodings für Sharedienste"
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "Encoding"
+msgstr "Encoding"
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "The encoding code name"
+msgstr "Der Encoding Codename"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "Label"
+msgstr "Label"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
+msgstr "Der angezeigte Encodingname"
+
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
+msgstr "Encodings"
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr "Aktiviert"
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr "Systemanalyse"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -125,496 +288,141 @@ msgstr "Root-Server"
 msgid "Swap server"
 msgstr "Auslagerungsaerver"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr "Startparameter"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Server"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Boot-Kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
+msgstr "Serverinformation"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Zu installierender und bootender Linux-Kernel"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "Server"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Boot Kernel Parameter"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr "Liste der Dienste"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Linux Kernel Parameter, die gestartet werden sollen"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr "Dienst"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Start"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr "!"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Terminal-Start"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Beschreibung"
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Liste der Systeme"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Aktionen"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Gesperrter Server"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Anlegen"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Gesperrte Arbeitsstation"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Entfernen"
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Gesperrtes Terminal"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr "Status erhalten"
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Windows-Arbeitsstation"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr "Start"
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr "Beenden"
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Arbeitsstation"
-
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Terminal"
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Drucker"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Telefon"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr "Mobiltelefon"
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "Komponente"
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Name"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr "IP"
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr "MAC"
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Beschreibung"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Dienste"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "Release"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Aktionen"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Anlegen"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "winStation"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Netzwerk-Drucker"
-
-#: admin/systems/system-list.xml:233
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Netzwerkgerät"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr "Aktion auslösen"
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr "Aktion planen"
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Entfernen"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr "System bearbeiten"
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr "System entfernen"
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr "Arbeitsstationinformation"
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr "Arbeitsstation"
-
-#: admin/systems/class_workstationGeneric.inc:148
-#: admin/systems/class_phoneGeneric.inc:56
-#: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr "Der Name der %s"
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr "Eine kurze Beschreibung der %s"
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Ort"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr "Der Ort des %s"
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr "Sperren dieser %s"
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr "Dies wird verhindern dass %s neu installiert wird"
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr "Netzwerkeinstellungen"
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr "Telefoninformationen"
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr "Telefon-Hardware"
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr "Der Name des Telefons"
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr "Eine kurze Beschreibung des Telefons"
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr "Seriennummer"
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr "Die Seriennummer des Telefons"
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr "Telefonnummer"
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr "Die Telefonnumer des Telefons"
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr "Druckerinformation"
-
-#: 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 "Details"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "Drucker-Standort"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "Drucker-URL"
-
-#: 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 "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr "IP-Adresse"
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "MAC-Adresse"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr "Windowspfade"
-
-#: 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_serverService.inc:58
-msgid "Server services"
-msgstr "Serverdienste"
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Fehler"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Filterfehler"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Der Filter ist unvollständig!"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Information"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr "Kann den Dienststatus nicht aktualisieren bis er gespeichert wurde!"
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr "Konnte ausführbare Aktion %s auf Dienst %s nicht bekommen."
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr "Terminalinformation"
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "Terminal"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Server"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr "Der root-Server den das Terminal verwenden sollte"
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "Der swap-Server den das Terminal verwenden sollte"
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Entfernte Arbeitsfläche"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Verbindungsmethode"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Keine"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Terminal-Server"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr "Neustart"
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr "Konnte %s nicht parsen"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr "Dienst bearbeiten"
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr "Kein DHCP-Server für IP %s gefunden"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr "Dienst entfernen"
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_networkSettings.inc:242
 #, php-format
-msgid "No DNS server found for zone %s"
-msgstr "Kein DNS-Server für Zone %s gefunden"
+msgid "IP address %s"
+msgstr "IP-Adresse %s"
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "Importieren"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "IP-Adresse"
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr "Der Server, von dem Sie Hosts importieren wollen"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "MAC-Adresse"
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr "Serverinformation"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Netzwerkeinstellungen"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Server"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
+msgstr "Komponente"
 
 #: admin/systems/class_componentGeneric.inc:37
 msgid "Component information"
 msgstr "Komponenteninformation"
 
+#: admin/systems/class_componentGeneric.inc:41
+#: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
+msgid "Network device"
+msgstr "Netzwerkgerät"
+
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_phoneGeneric.inc:56
+#: admin/systems/class_printGeneric.inc:58
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Name"
+
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
 msgstr "Der Name der Komponente"
@@ -623,6 +431,13 @@ msgstr "Der Name der Komponente"
 msgid "A short description of the component"
 msgstr "Eine kurze Beschreibung der Komponente"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr "Mobiltelefon"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr "Mobiltelefoninformation"
@@ -635,6 +450,19 @@ msgstr "Der Name des Mobiltelefons"
 msgid "A short description of the mobile phone"
 msgstr "Eine kurze Beschreibung des Mobiltelefons"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
+msgstr "Seriennummer"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The serial number of the mobile phone"
 msgstr "Die Seriennummer des Mobiltelefons"
@@ -659,6 +487,11 @@ msgstr "Das Betriebssystem, welches auf diesem Telefon installiert ist"
 msgid "SimCard"
 msgstr "SIM-Karte"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr "Telefonnummer"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr "Die Telefonnumer des Mobiltelefons"
@@ -671,89 +504,142 @@ msgstr "PUK-Nummer"
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Die PUK-Nummer der SIM-Karte in diesem Mobiltelefon"
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
-msgstr "Liste der Dienste"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
+msgstr "Startparameter"
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr "Dienst"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "Boot-Kernel"
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
+msgstr "Zu installierender und bootender Linux-Kernel"
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr "Status erhalten"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
+msgstr "Boot Kernel Parameter"
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
+msgstr "Linux Kernel Parameter, die gestartet werden sollen"
+
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr "Start"
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "Beenden"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
+msgstr "Terminal-Start"
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
-msgstr "Neustart"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Dienste"
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr "Dienst bearbeiten"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
+msgstr "Serverdienste"
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr "Dienst entfernen"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Fehler"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr "Filterfehler"
+
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr "Der Filter ist unvollständig!"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Information"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr "Kann den Dienststatus nicht aktualisieren bis er gespeichert wurde!"
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
+msgstr "Konnte ausführbare Aktion %s auf Dienst %s nicht bekommen."
+
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Arbeitsstation"
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr "Arbeitsstationinformation"
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr "Arbeitsstation"
+
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
+msgstr "Der Name der %s"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
+msgstr "Eine kurze Beschreibung der %s"
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Ort"
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
-msgstr ""
+msgid "The location of the %s"
+msgstr "Der Ort des %s"
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
-msgstr ""
+msgid "Lock this %s"
+msgstr "Sperren dieser %s"
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Berechtigung"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr "Dies wird verhindern dass %s neu installiert wird"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
+msgid "Could not parse %s"
+msgstr "Konnte %s nicht parsen"
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
+msgid "No DHCP server found for ip %s"
+msgstr "Kein DHCP-Server für IP %s gefunden"
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
-msgstr "Geerbt von %s"
+msgid "No DNS server found for zone %s"
+msgstr "Kein DNS-Server für Zone %s gefunden"
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Systeme"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "Importieren"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
-msgstr "Systemverwaltung"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
+msgstr "Der Server, von dem Sie Hosts importieren wollen"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
@@ -941,178 +827,307 @@ msgstr "Spezifiziert die Certificate Revocation List (CRL) des CA sollte verwend
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Liste der Systeme"
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr "Gesperrter Server"
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr "Gesperrte Arbeitsstation"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr "Gesperrtes Terminal"
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Windows-Arbeitsstation"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Drucker"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr "IP"
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr "MAC"
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "Release"
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr "winStation"
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "Netzwerk-Drucker"
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr "Aktion auslösen"
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr "Aktion planen"
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr "System bearbeiten"
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr "System entfernen"
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr "Telefoninformationen"
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr "Telefon-Hardware"
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr "Der Name des Telefons"
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr "Eine kurze Beschreibung des Telefons"
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr "Die Seriennummer des Telefons"
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr "Die Telefonnumer des Telefons"
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
-msgid "IP address %s"
-msgstr "IP-Adresse %s"
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr "MAC-Adresse"
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
-msgstr "Netzwerk"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Berechtigung"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
-msgstr "DHCP-Konfiguration"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
-msgstr "Statistiken und Informationen über Systeme"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
+msgstr "Geerbt von %s"
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
-msgstr "Statistiken"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
+msgstr "Systemverwaltung"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
-msgstr "Computername, der von Einheit genutzt werden soll"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
+msgstr "Druckerinformation"
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
-msgstr "Arbeitsstationen"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
-msgstr "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
-msgstr "Terminals"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
+msgstr "Details"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
-msgstr "Drucker"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr "Drucker-Standort"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
-msgstr "Telefone"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
-msgstr "Komponenten"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr "Drucker-URL"
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
-msgstr "Mobiltelefone"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Statistiken und verschiedene Informationen"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
-msgstr "DHCP"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
-msgstr "DNS"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "MAC-Adresse"
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
-msgstr "Systeme Plugin-Konfiguration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
-msgstr "LDAP-Baum für Systeme"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
+msgstr "Windowspfade"
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
-msgstr "Systems RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
-msgstr "Zweig in welchem Systeme gespeichert werden"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
-msgstr "Server RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
-msgstr "Zweig in welchem Server gespeichert werden"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
-msgstr "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
-msgstr "Zweig in welchem Workstations gespeichert werden"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
-msgstr "Terminal RDN"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
+msgstr "Terminalinformation"
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
-msgstr "Zweig in welchem Terminals gespeichert werden"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "Terminal"
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
-msgstr "Drucker RDN"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
+msgstr "Der root-Server den das Terminal verwenden sollte"
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
-msgstr "Zweig in welchem Drucker gespeichert werden"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
+msgstr "Der swap-Server den das Terminal verwenden sollte"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
-msgstr "Komponenten RDN"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "Entfernte Arbeitsfläche"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
-msgstr "Zweig in welchem Netzwerkgeräte gespeichert werden"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "Verbindungsmethode"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
-msgstr "Telefon RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "Keine"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr "Zweig, in dem Telefone gespeichert werden"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr "Mobiltelefon RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
+msgstr "LDM"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
-msgstr "Zweig in welchem Mobiltelefone gespeichert werden"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Verschiedenes"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
+msgstr "Telnet"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
-msgstr "Verfügbare Encodings für Sharedienste"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
-msgstr "Encoding"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "Terminal-Server"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
-msgstr "Der Encoding Codename"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
+msgstr "Es gibt mehrere argonaut-Server! (dies wird noch nicht unterstützt)"
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-msgstr "Label"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+msgstr "Es gibt einen auf %1 (%3://%2:%4) laufenden Argonaut-Server"
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
-msgstr "Der angezeigte Encodingname"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] "Nur ein System ist zur Ausführung eines Argonaut-Client konfiguriert."
+msgstr[1] "%1 Systeme sind zur Ausführung eines Argonaut-Client konfiguriert."
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-msgstr "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
+msgstr "Aber kein System ist konfiguriert, als argonaut-Client zu laufen!"
+
+#: 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] "Ein System ist zur Ausführung eines Argonaut-Client konfiguriert, aber es ist kein Argonaut-Server konfiguriert!"
+msgstr[1] "%1 Systeme sind zur Ausführung eines Argonaut-Client konfiguriert, aber es ist kein Argonaut-Server konfiguriert!"
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1168,6 @@ msgstr "Ausführen"
 msgid "Base"
 msgstr "Basis"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr "Netzwerk  Einstellungen"
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "IP-Adresse"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr "Schlage IP vor"
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "MAC-Adresse"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr "DHCP für dieses Gerät aktivieren"
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr "unkonfiguriert"
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr "Parent-Node"
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr "Einstellungen bearbeiten"
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr "Warnung: Nachdem Sie die OPSI Hosts nach FusionDirectory importiert haben, werden diese dort verwaltet. Wenn Sie danach einen direkt in OPSI löschen, so wird er dadurch nicht wirklich gelöscht."
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr "Dies beinhaltet alle Kontendaten, Systemzugangsregeln, Imap-Einstellunge
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder 'Abbrechen' zum Abbruch."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr "Warnung: Nachdem Sie die OPSI Hosts nach FusionDirectory importiert haben, werden diese dort verwaltet. Wenn Sie danach einen direkt in OPSI löschen, so wird er dadurch nicht wirklich gelöscht."
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filter"
@@ -1239,30 +1222,14 @@ msgstr "Zeige Netzwerk-Geräte"
 msgid "Show mobile phones"
 msgstr "Mobiltelefone anzeigen"
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr "Es gibt mehrere argonaut-Server! (dies wird noch nicht unterstützt)"
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr "Es gibt einen auf %1 (%3://%2:%4) laufenden Argonaut-Server"
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] "Nur ein System ist zur Ausführung eines Argonaut-Client konfiguriert."
-msgstr[1] "%1 Systeme sind zur Ausführung eines Argonaut-Client konfiguriert."
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "IP-Adresse"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr "Aber kein System ist konfiguriert, als argonaut-Client zu laufen!"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
+msgstr "Schlage IP vor"
 
-#: 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] "Ein System ist zur Ausführung eines Argonaut-Client konfiguriert, aber es ist kein Argonaut-Server konfiguriert!"
-msgstr[1] "%1 Systeme sind zur Ausführung eines Argonaut-Client konfiguriert, aber es ist kein Argonaut-Server konfiguriert!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "MAC-Adresse"
diff --git a/systems/locale/el_GR/fusiondirectory.po b/systems/locale/el_GR/fusiondirectory.po
index 5b1b00cbf5..7bcc81aa98 100644
--- a/systems/locale/el_GR/fusiondirectory.po
+++ b/systems/locale/el_GR/fusiondirectory.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,175 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr "Δίκτυο"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr "Στατιστικά και ποικίλες πληροφορίες"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr "DNS"
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Systems"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations about systems"
+msgstr "Στατιστικά και πληροφορίες για το systems"
+
+#: 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:74
+msgid "Workstations"
+msgstr "Σταθμοί εργασίας"
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Εξυπηρετητών"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr "Σταθμοί εργασίας Windows"
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr "Τερματικά"
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr "Εκτυπωτές"
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr "Τηλέφωνα"
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr "Συστατικά στοιχεία"
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+msgstr "Κινητά τηλέφωνα"
+
+#: config/systems/class_systemsPluginConfig.inc:29
+msgid "Systems plugin configuration"
+msgstr "Ρύθμιση προσθέτου Systems"
+
+#: config/systems/class_systemsPluginConfig.inc:40
+msgid "LDAP tree for systems"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Systems RDN"
+msgstr "Systems RDN"
+
+#: 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 "RDN εξυπηρετητή"
+
+#: 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 "RDN σταθμών εργασίας"
+
+#: 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 "RDN τερματικού"
+
+#: 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 "RDN εκτυπωτή"
+
+#: 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 "RDN στοιχείου"
+
+#: 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 " RDN τηλεφώνου"
+
+#: 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 "RDN κινητού τηλεφώνου"
+
+#: 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 "Κωδικοποιήσεις"
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr "Ενεργοποιήθηκε"
@@ -89,13 +258,7 @@ msgid "System analysis"
 msgstr "Ανάλυση συστήματος"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
 
@@ -128,496 +291,141 @@ msgstr "Εξυπηρετητής Root"
 msgid "Swap server"
 msgstr "Εξυπηρετητής Swap"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr "Παράμετροι εκκίνησης"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Εξυπηρετητής"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
+msgstr "Πληροφορίες εξυπηρετητή"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Ο πυρήνας Linux που θα εγκατασταθεί και θα εκκινηθεί"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "διακομιστής"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Παράμετροι εκκίνησης πυρήνα"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr "Λίστα υπηρεσιών"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Παράμετροι πυρήνα Linux για εκτέλεση"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr "Υπηρεσία"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Εκκίνηση"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr "!"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Εκκίνηση τερματικού"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Περιγραφή"
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Λίστα συστημάτων"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Ενέργειες"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Κλειδωμένος εξυπηρετητής"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Δημιουργία"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Κλειδωμένος σταθμός εργασίας"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Αφαίρεση"
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Κλειδωμένο τερματικό"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr "Λήψη κατάστασης"
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Winstation"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr "Έναρξη"
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Εξυπηρετητής"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr "Διακοπή"
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Σταθμός εργασίας"
-
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Τερματικό"
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Εκτυπωτής"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Τηλέφωνο"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr "Κινητό τηλέφωνο"
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "Στοιχείο"
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Όνομα"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr "IP"
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr "MAC"
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Περιγραφή"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Υπηρεσίες"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "Έκδοση"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Ενέργειες"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Δημιουργία"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "winStation"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Εκτυπωτής δικτύου"
-
-#: admin/systems/system-list.xml:233
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Συσκευή δικτύου:"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "Κινητό τηλέφωνο"
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr "Εκκίνηση ενέργειας"
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr "Προγραμματισμός εργασίας"
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Αφαίρεση"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr "Επεξεργασία συστήματος"
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr "Απομάκρυνση συστήματος"
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr "Πληροφορίες σταθμού εργασίας"
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr "σταθμός εργασίας"
-
-#: admin/systems/class_workstationGeneric.inc:148
-#: admin/systems/class_phoneGeneric.inc:56
-#: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
-msgid "Properties"
-msgstr "Ιδιότητες"
-
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr "Το όνομα του  %s"
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr "Μια σύντομη περιγραφή του %s"
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Τοποθεσία"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr "Η τοποθεσία του %s"
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr "Κλείδωμα του %s"
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr "Αυτό θα αποτρέψει το %s από το να επανεγκατασταθεί"
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr "Ρυθμίσεις δικτύου"
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr "Πληροφορίες τηλεφώνου"
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr "Υλικό τηλεφώνου"
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr "Το όνομα του τηλεφώνου"
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr "Μια σύντομη περιγραφή του τηλεφώνου"
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr "Σειριακός αριθμός"
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr "Ο σειριακός αριθμός γραμμής του τηλεφώνου"
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr "Τηλέφωνο"
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr "Ο αριθμός τηλεφώνου "
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr "Πληροφορίες εκτυπωτή"
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr "Λεπτομέρειες"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "Τοποθεσία εκτυπωτή"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "URL εκτυπωτή"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr "Χρήστες που επιτρέπεται να χρησιμοποιούν αυτόν τον εκτυπωτή"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr "Διεύθυνση IP"
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Διεύθυνση Mac "
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr "Διαδρομές Windows"
-
-#: 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_serverService.inc:58
-msgid "Server services"
-msgstr "Υπηρεσίες εξυπηρετητή"
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Σφάλμα φίλτρου"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Το φίλτρο δεν είναι ολοκληρωμένο! "
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Πληροφορίες"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr "Δεν ήταν δυνατή η εκτέλεση ενέργειας %s στην υπηρεσία %s."
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr "Πληροφορίες τερματικού"
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "τερματικό"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Εξυπηρετητών"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr "Ο εξυπηρετητής root που θα πρέπει να χρησιμοποιεί το τερματικό"
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "Ο εξυπηρετητής swap που θα πρέπει να χρησιμοποιεί το τερματικό"
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Απομακρυσμένη επιφάνεια εργασίας"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Μέθοδος σύνδεσης"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Κανένα"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Κέλυφος"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Εξυπηρετητής τερματικού"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr "Επανεκκίνηση"
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr "Αδύνατη η συντακτική ανάλυση %s"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr "Επεξεργασία υπηρεσίας"
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr "Δε βρέθηκε DHCP server για ip %s"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr "Αφαίρεση υπηρεσίας"
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_networkSettings.inc:242
 #, php-format
-msgid "No DNS server found for zone %s"
-msgstr "Δε βρέθηκε DNS server για την ζώνη %s"
+msgid "IP address %s"
+msgstr "Διεύθυνση IP %s"
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "Εισαγωγή"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "Διεύθυνση IP"
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr "Είστε σίγουροι ότι θέλετε να εισάγετε συστήματα από "
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "Διεύθυνση MAC"
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr "Πληροφορίες εξυπηρετητή"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Ρυθμίσεις δικτύου"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "διακομιστής"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
+msgstr "Στοιχείο"
 
 #: admin/systems/class_componentGeneric.inc:37
 msgid "Component information"
 msgstr "Πληροφορίες στοιχείου "
 
+#: admin/systems/class_componentGeneric.inc:41
+#: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
+msgid "Network device"
+msgstr "Συσκευή δικτύου:"
+
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_phoneGeneric.inc:56
+#: admin/systems/class_printGeneric.inc:58
+msgid "Properties"
+msgstr "Ιδιότητες"
+
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Όνομα"
+
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
 msgstr "Το όνομα του στοιχείου"
@@ -626,6 +434,13 @@ msgstr "Το όνομα του στοιχείου"
 msgid "A short description of the component"
 msgstr "Μια σύντομη περιγραφή του στοιχείου"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr "Κινητό τηλέφωνο"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr "Πληροφορίες κινητού τηλεφώνου"
@@ -638,6 +453,19 @@ msgstr "Το όνομα του κινητού τηλεφώνου"
 msgid "A short description of the mobile phone"
 msgstr "Μια σύντομη περιγραφή του κινητού τηλεφώνου"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
+msgstr "Σειριακός αριθμός"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The serial number of the mobile phone"
 msgstr "Ο σειριακός αριθμός του κινητού τηλεφώνου"
@@ -662,6 +490,11 @@ msgstr "Το λειτουργικό σύστημα που είναι εγκατ
 msgid "SimCard"
 msgstr "Κάρτα SIM"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr "Τηλέφωνο"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr "Ο αριθμός τηλεφώνου"
@@ -674,89 +507,142 @@ msgstr "Αριθμός PUK "
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Ο αριθμός PUK  της sim σε αυτό το κινητό"
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
-msgstr "Λίστα υπηρεσιών"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
+msgstr "Παράμετροι εκκίνησης"
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr "Υπηρεσία"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "Boot kernel"
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
+msgstr "Ο πυρήνας Linux που θα εγκατασταθεί και θα εκκινηθεί"
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr "Λήψη κατάστασης"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
+msgstr "Παράμετροι εκκίνησης πυρήνα"
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
-msgstr "Έναρξη"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
+msgstr "Παράμετροι πυρήνα Linux για εκτέλεση"
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "Διακοπή"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Εκκίνηση"
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
-msgstr "Επανεκκίνηση"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
+msgstr "Εκκίνηση τερματικού"
+
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Υπηρεσίες"
+
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
+msgstr "Υπηρεσίες εξυπηρετητή"
+
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr "Σφάλμα φίλτρου"
+
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr "Το φίλτρο δεν είναι ολοκληρωμένο! "
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Πληροφορίες"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
+msgstr "Δεν ήταν δυνατή η εκτέλεση ενέργειας %s στην υπηρεσία %s."
+
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Σταθμός εργασίας"
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr "Πληροφορίες σταθμού εργασίας"
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr "σταθμός εργασίας"
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr "Επεξεργασία υπηρεσίας"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
+msgstr "Το όνομα του  %s"
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr "Αφαίρεση υπηρεσίας"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
+msgstr "Μια σύντομη περιγραφή του %s"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Τοποθεσία"
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
-msgstr ""
+msgid "The location of the %s"
+msgstr "Η τοποθεσία του %s"
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
-msgstr ""
+msgid "Lock this %s"
+msgstr "Κλείδωμα του %s"
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Άδεια"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr "Αυτό θα αποτρέψει το %s από το να επανεγκατασταθεί"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Δεν επιτρέπεται να δημιουργήσετε ένα στιγμιότυπο για  %s."
+msgid "Could not parse %s"
+msgstr "Αδύνατη η συντακτική ανάλυση %s"
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Δεν επιτρέπεται να επαναφέρετε ένα στιγμιότυπο για  %s."
+msgid "No DHCP server found for ip %s"
+msgstr "Δε βρέθηκε DHCP server για ip %s"
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
-msgstr "Κληρονομήθηκε από %s"
+msgid "No DNS server found for zone %s"
+msgstr "Δε βρέθηκε DNS server για την ζώνη %s"
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Systems"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "Εισαγωγή"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
-msgstr "Διαχείριση Systems "
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
+msgstr "Είστε σίγουροι ότι θέλετε να εισάγετε συστήματα από "
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
@@ -944,178 +830,307 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
-#, php-format
-msgid "IP address %s"
-msgstr "Διεύθυνση IP %s"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Λίστα συστημάτων"
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr "Διεύθυνση MAC"
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr "Κλειδωμένος εξυπηρετητής"
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
-msgstr "Δίκτυο"
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr "Κλειδωμένος σταθμός εργασίας"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr "Κλειδωμένο τερματικό"
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
-msgstr "Ρύθμιση DHCP"
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Winstation"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
-msgstr "Στατιστικά και πληροφορίες για το systems"
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Τερματικό"
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
-msgstr "Στατιστικά"
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Εκτυπωτής"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr "IP"
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr "MAC"
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "Έκδοση"
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr "winStation"
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "Εκτυπωτής δικτύου"
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr "Κινητό τηλέφωνο"
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr "Εκκίνηση ενέργειας"
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr "Προγραμματισμός εργασίας"
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr "Επεξεργασία συστήματος"
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr "Απομάκρυνση συστήματος"
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr "Πληροφορίες τηλεφώνου"
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr "Υλικό τηλεφώνου"
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr "Το όνομα του τηλεφώνου"
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr "Μια σύντομη περιγραφή του τηλεφώνου"
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr "Ο σειριακός αριθμός γραμμής του τηλεφώνου"
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr "Ο αριθμός τηλεφώνου "
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
-msgstr "Σταθμοί εργασίας"
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
-msgstr "Σταθμοί εργασίας Windows"
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
-msgstr "Τερματικά"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Άδεια"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
-msgstr "Εκτυπωτές"
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Δεν επιτρέπεται να δημιουργήσετε ένα στιγμιότυπο για  %s."
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
-msgstr "Τηλέφωνα"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Δεν επιτρέπεται να επαναφέρετε ένα στιγμιότυπο για  %s."
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
-msgstr "Συστατικά στοιχεία"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
+msgstr "Κληρονομήθηκε από %s"
+
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
+msgstr "Διαχείριση Systems "
+
+#: 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 "Τοποθεσία εκτυπωτή"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
-msgstr "Κινητά τηλέφωνα"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Στατιστικά και ποικίλες πληροφορίες"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr "URL εκτυπωτή"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
-msgstr "DNS"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr "Χρήστες που επιτρέπεται να χρησιμοποιούν αυτόν τον εκτυπωτή"
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
-msgstr "Ρύθμιση προσθέτου Systems"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
-msgstr "Systems RDN"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Διεύθυνση Mac "
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
-msgstr "RDN εξυπηρετητή"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
+msgstr "Διαδρομές Windows"
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
-msgstr "RDN σταθμών εργασίας"
-
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
-msgstr "RDN τερματικού"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
-msgstr "RDN εκτυπωτή"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
-msgstr "RDN στοιχείου"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
+msgstr "Πληροφορίες τερματικού"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "τερματικό"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
-msgstr " RDN τηλεφώνου"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
+msgstr "Ο εξυπηρετητής root που θα πρέπει να χρησιμοποιεί το τερματικό"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
+msgstr "Ο εξυπηρετητής swap που θα πρέπει να χρησιμοποιεί το τερματικό"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr "RDN κινητού τηλεφώνου"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "Απομακρυσμένη επιφάνεια εργασίας"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "Μέθοδος σύνδεσης"
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Διάφορα"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "Κανένα"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
-msgstr "Διαθέσιμες κωδικοποιήσεις για τις υπηρεσίες κοινής χρήσης"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
-msgstr "Κωδικοποίηση"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
+msgstr "LDM"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
-msgstr "Η ονομασία της κωδικοποίησης"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Κέλυφος"
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-msgstr "Ετικέτα"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
+msgstr "Telnet"
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
-msgstr "Η ονομασία της κωδικοποίησης που θα εμφανίζεται"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-msgstr "Κωδικοποιήσεις"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "Εξυπηρετητής τερματικού"
+
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
+msgstr "Υπάρχουν αρκετοί εξυπηρετητές argonaut! (αυτός δεν υποστηρίζεται ακόμη)"
+
+#: 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] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1156,45 +1171,6 @@ msgstr "Εκτέλεση"
 msgid "Base"
 msgstr "Βάση"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr "Ρυθμίσεις δικτύου"
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "Διεύθυνση IP"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr "Πρόταση για ip"
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "Διεύθυνση MAC"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr "Ενεργοποίηση υπηρεσίας  DHCP για αυτήν την υπηρεσία"
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr "δεν εχει ρυθμιστεί"
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr "Γονικό νήμα"
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr "Επεξεργασία ρυθμίσεων"
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr "Προσοχή: Μετά την εισαγωγή των διακομιστών OPSI στο FusionDirectory, αυτοί θα ελέγχονται από αυτό (FD). Συνεπώς, αν τα διαγράψετε ή απενεργοποιήσετε την OPSI καρτέλα τους, θα διαγραφούν από το OPSI"
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1206,6 +1182,13 @@ msgstr "Το παρόν περιλαμβάνει όλα τα δεδομένα λ
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Αν είστε σίγουροι, πατήστε \"Διαγραφή\" για να συνεχίσετε ή \"Ακύρωση\" για να εγκαταλείψετε. "
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr "Προσοχή: Μετά την εισαγωγή των διακομιστών OPSI στο FusionDirectory, αυτοί θα ελέγχονται από αυτό (FD). Συνεπώς, αν τα διαγράψετε ή απενεργοποιήσετε την OPSI καρτέλα τους, θα διαγραφούν από το OPSI"
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Φίλτρο"
@@ -1242,30 +1225,14 @@ msgstr "Προβολή συσκευών δικτύου"
 msgid "Show mobile phones"
 msgstr "Προβολή κινητών τηλεφώνων"
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr "Υπάρχουν αρκετοί εξυπηρετητές argonaut! (αυτός δεν υποστηρίζεται ακόμη)"
-
-#: 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] ""
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "Διεύθυνση IP"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
+msgstr "Πρόταση για ip"
 
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "Διεύθυνση MAC"
diff --git a/systems/locale/es/fusiondirectory.po b/systems/locale/es/fusiondirectory.po
index f5055cb491..8bcafd4818 100644
--- a/systems/locale/es/fusiondirectory.po
+++ b/systems/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr "DHCP"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr "DNS"
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Sistemas"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Servidores"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 "Varios"
+
+#: 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 "Etiqueta"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
+msgstr ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr "Activado"
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr "Análisis del sistema"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -125,366 +288,257 @@ msgstr "Servidor Raíz"
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Servidor"
+
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Kernel de inicio"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "Servidor"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr ""
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr "Lista de servicios"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr ""
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr "Servicio"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr ""
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr "!"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Inicio"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Descripción"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Inicio de terminal"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Acciones"
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Lista de sistemas"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Crear"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Servidor bloqueado"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Eliminar"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Estación de trabajo bloqueada"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Terminal bloqueado"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr "Inicio"
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Estación de trabajo Windows"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr "Parada"
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Servidor"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr "Reiniciar"
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Estación de trabajo"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr "Editar servicio"
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Terminal"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr "Eliminar servicio"
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Impresora"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
+msgstr "Dirección IP %s"
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Teléfono"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "Dirección IP"
 
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr "Teléfono móvil"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "Dirección MAC"
+
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
 
-#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
 msgid "Component"
 msgstr "componente"
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr "IP"
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr "MAC"
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Servicios"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "Versión"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Acciones"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Crear"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Impresora de Red"
-
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr "Dispositivo de Red"
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr "Acción disparada"
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr "Acción programada"
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Eliminar"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr "Eliminar sistema"
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr "estación de trabajo"
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Localización"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Nombre"
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr "Teléfono móvil"
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Teléfono"
 
-#: admin/systems/class_phoneGeneric.inc:73
 #: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr "Detalles"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "Localización de la impresora"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "URL de la impresora"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr "Usuarios que tienen permiso para acceder a esta impresora"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr "usuarios que tienen permisos para administrar esta impresora"
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr "Dirección IP"
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "Kernel de inicio"
 
-#: admin/systems/class_printGeneric.inc:123
-msgid "Inf file"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:123
-msgid "Path to windows inf file for this printer"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:127
-msgid "Driver directory"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:127
-msgid "Path to directory that contains windows drivers for this printer"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Inicio"
 
-#: admin/systems/class_printGeneric.inc:131
-msgid "Driver name"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
+msgstr "Inicio de terminal"
 
-#: admin/systems/class_printGeneric.inc:131
-msgid "Windows name of the printer driver"
-msgstr ""
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Servicios"
 
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
@@ -494,7 +548,6 @@ msgstr ""
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
 #: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
 msgid "Error"
 msgstr "Error"
 
@@ -502,257 +555,90 @@ msgstr "Error"
 msgid "Filter error"
 msgstr "Error del filtro"
 
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "¡El filtro está incompleto!"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Información"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr "¡No puedo actualizar el estado del servicio hasta que no se haya grabado!"
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "terminal"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Servidores"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Método de conexión"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Ninguno"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Servidor de terminal"
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "Importar"
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Servidor"
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
-msgstr "Lista de servicios"
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr "¡El filtro está incompleto!"
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr "Servicio"
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Información"
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr "!"
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr "¡No puedo actualizar el estado del servicio hasta que no se haya grabado!"
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
-msgstr "Inicio"
-
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "Parada"
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Estación de trabajo"
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
-msgstr "Reiniciar"
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr "Editar servicio"
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr "estación de trabajo"
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr "Eliminar servicio"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Localización"
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Permisos"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "No tiene permisos para crear una instantanea para %s."
+msgid "Could not parse %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "No tiene permisos para recuperar una instantanea para %s."
+msgid "No DHCP server found for ip %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
-msgstr "Heredado de %s"
+msgid "No DNS server found for zone %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Sistemas"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "Importar"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,178 +827,307 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
-#, php-format
-msgid "IP address %s"
-msgstr "Dirección IP %s"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Lista de sistemas"
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr "Dirección MAC"
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr "Servidor bloqueado"
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr "Estación de trabajo bloqueada"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr "Terminal bloqueado"
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Estación de trabajo Windows"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Impresora"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr "IP"
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr "MAC"
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "Versión"
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
-msgstr "Configuración DHCP"
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "Impresora de Red"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr "Acción disparada"
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr "Acción programada"
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr "Eliminar sistema"
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Permisos"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "No tiene permisos para crear una instantanea para %s."
+
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "No tiene permisos para recuperar una instantanea para %s."
+
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
+msgstr "Heredado de %s"
+
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
+msgstr "Detalles"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr "Localización de la impresora"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr "URL de la impresora"
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
-msgstr "DHCP"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr "Usuarios que tienen permiso para acceder a esta impresora"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
-msgstr "DNS"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr "usuarios que tienen permisos para administrar esta impresora"
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "terminal"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "Método de conexión"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "Ninguno"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Varios"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
+msgstr "LDM"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
+msgstr "Telnet"
+
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "Servidor de terminal"
+
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-msgstr "Etiqueta"
+#: 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] ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-msgstr ""
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1168,6 @@ msgstr "Ejecute"
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "Dirección IP"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr "Proponer ip"
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "Dirección MAC"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr "Activar DHCP para este dispositivo"
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr "Sin configurar"
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr "Servidor Origen"
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr "Editar características"
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr "Esto incluye toda la data de la cuenta, las reglas de acceso de sistema,
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtro"
@@ -1239,30 +1222,14 @@ msgstr "Mostrar dispositivos de Red"
 msgid "Show mobile phones"
 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] ""
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "Dirección IP"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
+msgstr "Proponer ip"
 
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "Dirección MAC"
diff --git a/systems/locale/es_CO/fusiondirectory.po b/systems/locale/es_CO/fusiondirectory.po
index 9be22d09e0..3900b56755 100644
--- a/systems/locale/es_CO/fusiondirectory.po
+++ b/systems/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr "Estadísticas e información general"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations about systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:43
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#: addons/dashboard/class_dashBoardSystems.inc:48
+msgid "Computer name to use by unit"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 "Miscelánea"
+
+#: 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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -125,634 +288,357 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Descripción"
+
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Acciones"
+
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Crear"
+
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Borrar"
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Teléfono"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
 msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr ""
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr ""
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Acciones"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Crear"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Borrar"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Ubicación"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Nombre"
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Teléfono"
 
-#: admin/systems/class_phoneGeneric.inc:73
 #: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
 #: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Error al filtrar"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "¡El filtro está incompleto!"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Información"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Ninguno"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr ""
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Error"
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr "Error al filtrar"
+
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr "¡El filtro está incompleto!"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Información"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Ubicación"
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Permisos"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Usted no tiene permitido crear un 'snashot' para %s."
+msgid "Could not parse %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Usted no está autorizado para restaurar un 'snapshot' para %s"
+msgid "No DHCP server found for ip %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,179 +827,308 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Permisos"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Usted no tiene permitido crear un 'snashot' para %s."
+
+#: admin/systems/class_systemManagement.inc:475
 #, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr ""
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Usted no está autorizado para restaurar un 'snapshot' para %s"
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
-msgstr "Estadísticas"
-
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Estadísticas e información general"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "Ninguno"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Miscelánea"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1168,6 @@ msgstr ""
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Si está seguro presione 'Eliminar' para continuar o 'Cancelar' para abortar."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtro"
@@ -1239,30 +1222,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/es_VE/fusiondirectory.po b/systems/locale/es_VE/fusiondirectory.po
index a031b8caca..01197f3517 100644
--- a/systems/locale/es_VE/fusiondirectory.po
+++ b/systems/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr "DHCP"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr "DNS"
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Sistemas"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Servidor"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 "Varios"
+
+#: 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 "Etiqueta"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
+msgstr ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr "Activado"
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr "Análisis del sistema"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
@@ -125,366 +288,257 @@ msgstr "Servidor Raíz"
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Servidor"
+
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Kernel de inicio"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "Servidor"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr ""
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr "Lista de servicios"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr ""
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr "Servicio"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr ""
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr "!"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Inicio"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Descripción"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Inicio de terminal"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Acciones"
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Lista de sistemas"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Crear"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Servidor bloqueado"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Eliminar"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Estación de trabajo bloqueada"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Terminal bloqueado"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr "Inicio"
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Estación de trabajo Windows"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr "Parada"
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Servidor"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr "Reiniciar"
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Estación de trabajo"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr "Editar servicio"
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Terminal"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr "Eliminar servicio"
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Impresora"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
+msgstr "Dirección IP %s"
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Teléfono"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "Dirección IP"
 
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "Dirección MAC"
+
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
 msgid "Component"
 msgstr "componente"
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr "IP"
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr "MAC"
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Descripción"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Servicios"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "Versión"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Acciones"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Crear"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Impresora de Red"
-
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr "Dispositivo de Red"
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr "Acción disparada"
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr "Acción programada"
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Eliminar"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr "Eliminar sistema"
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr "estación de trabajo"
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Localización"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Nombre"
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Teléfono"
 
-#: admin/systems/class_phoneGeneric.inc:73
 #: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr "Detalles"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "Localización de la impresora"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "URL de la impresora"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr "Usuarios que tienen permiso para acceder a esta impresora"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr "usuarios que tienen permisos para administrar esta impresora"
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr "Dirección IP"
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "Kernel de inicio"
 
-#: admin/systems/class_printGeneric.inc:123
-msgid "Inf file"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:123
-msgid "Path to windows inf file for this printer"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:127
-msgid "Driver directory"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:127
-msgid "Path to directory that contains windows drivers for this printer"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Inicio"
 
-#: admin/systems/class_printGeneric.inc:131
-msgid "Driver name"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
+msgstr "Inicio de terminal"
 
-#: admin/systems/class_printGeneric.inc:131
-msgid "Windows name of the printer driver"
-msgstr ""
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Servicios"
 
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
@@ -494,7 +548,6 @@ msgstr ""
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
 #: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
 msgid "Error"
 msgstr "Error"
 
@@ -521,239 +574,72 @@ msgstr "¡No puedo actualizar el estado del servicio hasta que no se haya grabad
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "terminal"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Servidor"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Método de conexión"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Ninguno"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Servidor de terminal"
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "Importar"
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Servidor"
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Estación de trabajo"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr "estación de trabajo"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
-msgstr "Lista de servicios"
-
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr "Servicio"
-
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr "!"
-
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
-msgstr "Inicio"
-
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "Parada"
-
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
-msgstr "Reiniciar"
-
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr "Editar servicio"
-
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr "Eliminar servicio"
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Localización"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_workstationGeneric.inc:164
+#, php-format
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "System %s is currently installing"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Permisos"
-
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "No tiene permisos para crear una instantanea para %s."
+msgid "Could not parse %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "No tiene permisos para recuperar una instantanea para %s."
+msgid "No DHCP server found for ip %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
-msgstr "Heredado de %s"
+msgid "No DNS server found for zone %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Sistemas"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "Importar"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
-msgstr "Administración de Sistemas"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
+msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
@@ -941,178 +827,307 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
-#, php-format
-msgid "IP address %s"
-msgstr "Dirección IP %s"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Lista de sistemas"
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr "Dirección MAC"
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr "Servidor bloqueado"
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr "Estación de trabajo bloqueada"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr "Terminal bloqueado"
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Estación de trabajo Windows"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Impresora"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr "IP"
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr "MAC"
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "Versión"
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
-msgstr "Configuración DHCP"
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "Impresora de Red"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr "Acción disparada"
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr "Acción programada"
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr "Eliminar sistema"
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Permisos"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "No tiene permisos para crear una instantanea para %s."
+
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "No tiene permisos para recuperar una instantanea para %s."
+
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
+msgstr "Heredado de %s"
+
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
+msgstr "Administración de Sistemas"
+
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
+msgstr "Detalles"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr "Localización de la impresora"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr "URL de la impresora"
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
-msgstr "DHCP"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr "Usuarios que tienen permiso para acceder a esta impresora"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
-msgstr "DNS"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr "usuarios que tienen permisos para administrar esta impresora"
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "terminal"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "Método de conexión"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "Ninguno"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Varios"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
+msgstr "LDM"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
+msgstr "Telnet"
+
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "Servidor de terminal"
+
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-msgstr "Etiqueta"
+#: 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] ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-msgstr ""
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1168,6 @@ msgstr "Ejecute"
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr "Opciones de red"
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "Dirección IP"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr "Proponer ip"
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "Dirección MAC"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr "Activar DHCP para este dispositivo"
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr "Sin configurar"
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr "Nodo padre"
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr "Editar características"
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr "Esto incluye toda la data de la cuenta, reglas de acceso de sistema, opc
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtro"
@@ -1239,30 +1222,14 @@ msgstr "Mostrar dispositivos de Red"
 msgid "Show mobile phones"
 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] ""
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "Dirección IP"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
+msgstr "Proponer ip"
 
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "Dirección MAC"
diff --git a/systems/locale/fa_IR/fusiondirectory.po b/systems/locale/fa_IR/fusiondirectory.po
index b594dd8c83..114c87d010 100644
--- a/systems/locale/fa_IR/fusiondirectory.po
+++ b/systems/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "خطای LDAP"
 
@@ -125,494 +288,139 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "تلفن"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr ""
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr ""
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
-msgid "Release"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr ""
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "خطا"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
 msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
@@ -623,6 +431,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr ""
@@ -631,8 +446,21 @@ msgstr ""
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "تلفن"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
 msgstr ""
 
 #: admin/systems/class_mobilePhoneGeneric.inc:77
@@ -659,6 +487,11 @@ msgstr ""
 msgid "SimCard"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr ""
@@ -671,88 +504,141 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "خطا"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:152
 #, php-format
-msgid "System %s is currently installing"
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "جواز"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "Inherited from %s"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:72
+#, php-format
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:116
+#, php-format
+msgid "No DHCP server found for ip %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:130
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,179 +827,306 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
-msgid "IP address %s"
+msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "جواز"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+
+#: 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] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1166,6 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1177,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,28 +1220,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
diff --git a/systems/locale/fi_FI/fusiondirectory.po b/systems/locale/fi_FI/fusiondirectory.po
index dcfe8b1db7..160bc226d6 100644
--- a/systems/locale/fi_FI/fusiondirectory.po
+++ b/systems/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
@@ -125,495 +288,140 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Kuvaus"
+
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Toiminnot"
+
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Luo"
+
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Poista"
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Puhelin"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
 msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Nimi"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Kuvaus"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Palvelut"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr ""
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Toiminnot"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Luo"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Poista"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Virhe"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
-msgstr ""
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Nimi"
 
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
@@ -623,6 +431,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr ""
@@ -631,8 +446,21 @@ msgstr ""
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Puhelin"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
 msgstr ""
 
 #: admin/systems/class_mobilePhoneGeneric.inc:77
@@ -659,6 +487,11 @@ msgstr ""
 msgid "SimCard"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr ""
@@ -671,88 +504,141 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Palvelut"
+
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Virhe"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:152
 #, php-format
-msgid "System %s is currently installing"
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Lupa"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "Inherited from %s"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:72
+#, php-format
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:116
+#, php-format
+msgid "No DHCP server found for ip %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:130
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,179 +827,308 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
 #, php-format
-msgid "IP address %s"
+msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr ""
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Lupa"
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1168,6 @@ msgstr "Suorita"
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,30 +1222,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/fr/fusiondirectory.po b/systems/locale/fr/fusiondirectory.po
index 4ee808c1a9..8cb1fd7058 100644
--- a/systems/locale/fr/fusiondirectory.po
+++ b/systems/locale/fr/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,175 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr "Réseau"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr "Statistiques et informations diverses"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr "DHCP"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr "DNS"
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Systèmes"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations about systems"
+msgstr "Statistiques et informations sur les systèmes"
+
+#: addons/dashboard/class_dashBoardSystems.inc:43
+msgid "Statistics"
+msgstr "Statistiques"
+
+#: addons/dashboard/class_dashBoardSystems.inc:48
+msgid "Computer name to use by unit"
+msgstr "Nom d'ordinateur à utiliser par unité"
+
+#: addons/dashboard/class_dashBoardSystems.inc:74
+msgid "Workstations"
+msgstr "Stations de travail"
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Serveurs"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr "Stations de travail Windows"
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr "Terminaux"
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr "Imprimantes"
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr "Téléphones"
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr "Composants"
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+msgstr "Téléphones portables"
+
+#: config/systems/class_systemsPluginConfig.inc:29
+msgid "Systems plugin configuration"
+msgstr "Configuration du plugin Systèmes"
+
+#: config/systems/class_systemsPluginConfig.inc:40
+msgid "LDAP tree for systems"
+msgstr "Arbre LDAP des systèmes"
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Systems RDN"
+msgstr "Branche des systèmes"
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Branch in which systems will be stored"
+msgstr "Branche où seront stockés les systèmes"
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Server RDN"
+msgstr "Branche des serveurs"
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Branch in which servers will be stored"
+msgstr "Branche où seront stockés les serveurs"
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Workstations RDN"
+msgstr "Branche des stations de travail"
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Branch in which workstations will be stored"
+msgstr "Branches où seront stockées les stations de travail"
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Terminal RDN"
+msgstr "Branche des terminaux"
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Branch in which terminals will be stored"
+msgstr "Branche où seront stockés les terminaux"
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Printer RDN"
+msgstr "Branche des imprimantes"
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Branch in which printers will be stored"
+msgstr "Branche où seront stockées les imprimantes"
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Component RDN"
+msgstr "Branche des composants"
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Branch in which network devices will be stored"
+msgstr "Branche où seront stockés les périphériques réseaux"
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Phone RDN"
+msgstr "Branche des téléphones"
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Branch in which phones will be stored"
+msgstr "Branche où seront stockés les téléphones"
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Mobile phone RDN"
+msgstr "Branche des téléphones portables"
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Branch in which mobile phones will be stored"
+msgstr "Branche où seront stockés les téléphones portables"
+
+#: config/systems/class_systemsPluginConfig.inc:85
+msgid "Miscellaneous"
+msgstr "Divers"
+
+#: config/systems/class_systemsPluginConfig.inc:89
+msgid "Available encodings for share services"
+msgstr "Encodages disponibles pour les services de partage"
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "Encoding"
+msgstr "Encodage"
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "The encoding code name"
+msgstr "Nom de l'encodage"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "Label"
+msgstr "Étiquette"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
+msgstr "Nom affiché de l'encodage"
+
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
+msgstr "Encodages"
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr "Activé"
@@ -88,13 +257,7 @@ msgid "System analysis"
 msgstr "Analyse du système"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -127,496 +290,141 @@ msgstr "Serveur racine"
 msgid "Swap server"
 msgstr "Serveur de swap"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr "Paramètres de démarrage"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Serveur"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Noyau de démarrage"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
+msgstr "Information du serveur"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Noyau Linux à installer et à démarrer"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "serveur"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Paramètres de démarrage du noyau"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr "Liste des services"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Paramètres de démarrage à passer au noyau Linux"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr "Service"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Démarrage"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr "!"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Démarrage du terminal"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Description"
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Liste des systèmes"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Actions"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Serveur verrouillé"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Créer"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Station de travail verrouillée"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Supprimer"
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Terminal verrouillé"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr "Obtenir le statut"
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "PC Windows"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr "Démarrer"
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Serveur"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr "Arrêter"
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Station de travail"
-
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Terminal"
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Imprimante"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Téléphone"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr "Téléphone portable"
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "Composant"
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Nom"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr "IP"
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr "MAC"
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Description"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Services"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "Version"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Actions"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Créer"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "PC Windows"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Imprimante réseau"
-
-#: admin/systems/system-list.xml:233
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Périphérique réseau"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "Téléphone portable"
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr "Déclencher une action"
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr "Programmer une action"
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Supprimer"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr "Éditer le système"
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr "Supprimer le système"
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr "Information de la station de travail"
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr "station de travail"
-
-#: admin/systems/class_workstationGeneric.inc:148
-#: admin/systems/class_phoneGeneric.inc:56
-#: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
-msgid "Properties"
-msgstr "Propriétés"
-
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr "Le nom de ce %s"
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr "Une courte description de ce %s"
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Lieu"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr "L'emplacement de ce %s"
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr "Verrouiller ce %s"
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr "Ceci empêchera ce %s d'être réinstallé"
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr "Paramètres réseaux"
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr "Information sur le téléphone"
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr "Matériel téléphonique"
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr "Nom du téléphone"
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr "Courte description du téléphone"
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr "Numéro de série"
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr "Numéro de série du téléphone"
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr "Numéro de téléphone"
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr "Numéro de téléphone"
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr "Information de l’imprimante"
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr "Le nom de l'imprimante"
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr "Courte description de l'imprimante"
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr "Détails"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "Localisation de l'imprimante"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr "La localisation de l'imprimante"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "URL de l'imprimante"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr "L'url de l'imprimante"
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr "Utilisateurs qui sont autorisés à utiliser cette imprimante"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr "Utilisateurs qui sont autorisés à administrer cette imprimante"
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr "Adresse IP"
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr "L'adresse ip de cet imprimante"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Adresse mac"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr "L'adresse mac de cette imprimante"
-
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr "Répertoires Windows"
-
-#: admin/systems/class_printGeneric.inc:123
-msgid "Inf file"
-msgstr "Le nom du fichier inf"
-
-#: admin/systems/class_printGeneric.inc:123
-msgid "Path to windows inf file for this printer"
-msgstr "Le chemin vers le fichier inf de cette imprimante"
-
-#: admin/systems/class_printGeneric.inc:127
-msgid "Driver directory"
-msgstr "Répertoire du pilote d'imprimante"
-
-#: admin/systems/class_printGeneric.inc:127
-msgid "Path to directory that contains windows drivers for this printer"
-msgstr "Le chemin vers le répertoire qui contient les drivers inf pour cette imprimante"
-
-#: admin/systems/class_printGeneric.inc:131
-msgid "Driver name"
-msgstr "Nom du driver d'imprimante"
-
-#: admin/systems/class_printGeneric.inc:131
-msgid "Windows name of the printer driver"
-msgstr "Nom windows de ce pilote d'imprimante"
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr "Services serveur"
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Erreur"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Erreur de filtre"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Le filtre est incomplet !"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Information"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr "Impossible de mettre à jour le statut avant que cela soit sauvé !"
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr "Impossible d'exécuter l'action %s sur le service %s."
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr "Information du terminal"
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "terminal"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Serveurs"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr "Le serveur racine que le terminal doit utiliser"
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "Le serveur de swap que le terminal doit utiliser"
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Bureau distant"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Méthode de connexion"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Aucun"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Serveur de terminaux"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr "Réessayer"
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr "Impossible de lire le contenu de %s"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr "Éditer le service"
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr "Pas de serveur DHCP trouvé pour l'IP %s"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr "Supprimer le service"
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_networkSettings.inc:242
 #, php-format
-msgid "No DNS server found for zone %s"
-msgstr "Pas de serveur DNS trouvé pour la zone %s"
+msgid "IP address %s"
+msgstr "Adresse IP %s"
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "Importer"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "Adresse IP"
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr "Le serveur duquel vous souhaitez importer des machines"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "Adresse MAC"
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr "Information du serveur"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Paramètres réseaux"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "serveur"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
+msgstr "Composant"
 
 #: admin/systems/class_componentGeneric.inc:37
 msgid "Component information"
 msgstr "Information du composant"
 
+#: admin/systems/class_componentGeneric.inc:41
+#: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
+msgid "Network device"
+msgstr "Périphérique réseau"
+
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_phoneGeneric.inc:56
+#: admin/systems/class_printGeneric.inc:58
+msgid "Properties"
+msgstr "Propriétés"
+
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Nom"
+
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
 msgstr "Nom du composant"
@@ -625,6 +433,13 @@ msgstr "Nom du composant"
 msgid "A short description of the component"
 msgstr "Description courte du composant"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr "Téléphone portable"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr "Information du téléphone portable"
@@ -637,6 +452,19 @@ msgstr "Nom du téléphone portable"
 msgid "A short description of the mobile phone"
 msgstr "Courte description du téléphone portable"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Téléphone"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
+msgstr "Numéro de série"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The serial number of the mobile phone"
 msgstr "Numéro de série du téléphone portable"
@@ -661,6 +489,11 @@ msgstr "Système d'exploitation installé sur ce téléphone"
 msgid "SimCard"
 msgstr "Carte SIM"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr "Numéro de téléphone"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr "Numéro du téléphone portable"
@@ -673,89 +506,142 @@ msgstr "Numéro PUK"
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Numéro PUK de la carte SIM du téléphone portable"
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
-msgstr "Liste des services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
+msgstr "Paramètres de démarrage"
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr "Service"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "Noyau de démarrage"
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
+msgstr "Noyau Linux à installer et à démarrer"
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr "Obtenir le statut"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
+msgstr "Paramètres de démarrage du noyau"
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
-msgstr "Démarrer"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
+msgstr "Paramètres de démarrage à passer au noyau Linux"
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "Arrêter"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Démarrage"
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
-msgstr "Réessayer"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
+msgstr "Démarrage du terminal"
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr "Éditer le service"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Services"
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr "Supprimer le service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
+msgstr "Services serveur"
+
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Erreur"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr "Erreur de filtre"
+
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr "Le filtre est incomplet !"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Information"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr "Impossible de mettre à jour le statut avant que cela soit sauvé !"
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
+msgstr "Impossible d'exécuter l'action %s sur le service %s."
+
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Station de travail"
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr "Information de la station de travail"
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr "station de travail"
+
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
+msgstr "Le nom de ce %s"
+
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
+msgstr "Une courte description de ce %s"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
-msgstr "Action annulée"
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Lieu"
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
-msgstr "Système %s n'a pas d'adresse mac définie, ne peut pas déclencher l'action"
+msgid "The location of the %s"
+msgstr "L'emplacement de ce %s"
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
-msgstr "Système %s est actuellement en cours d'installation"
+msgid "Lock this %s"
+msgstr "Verrouiller ce %s"
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Permission"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr "Ceci empêchera ce %s d'être réinstallé"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Vous n'êtes pas autorisé à créer un nouvel instantané pour %s."
+msgid "Could not parse %s"
+msgstr "Impossible de lire le contenu de %s"
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Vous n'êtes pas autorisé à restaurer un instantané de %s."
+msgid "No DHCP server found for ip %s"
+msgstr "Pas de serveur DHCP trouvé pour l'IP %s"
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
-msgstr "Hérité de %s"
+msgid "No DNS server found for zone %s"
+msgstr "Pas de serveur DNS trouvé pour la zone %s"
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Systèmes"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "Importer"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
-msgstr "Gestion des systèmes"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
+msgstr "Le serveur duquel vous souhaitez importer des machines"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
@@ -943,178 +829,307 @@ msgstr "Indique si la liste de certificats révoqués (CRL) de l'autorité de ce
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Liste des systèmes"
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr "Serveur verrouillé"
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr "Station de travail verrouillée"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr "Terminal verrouillé"
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "PC Windows"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Imprimante"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr "IP"
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr "MAC"
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "Version"
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr "PC Windows"
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "Imprimante réseau"
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr "Téléphone portable"
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr "Déclencher une action"
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr "Programmer une action"
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr "Éditer le système"
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr "Supprimer le système"
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr "Information sur le téléphone"
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr "Matériel téléphonique"
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr "Nom du téléphone"
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr "Courte description du téléphone"
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr "Numéro de série du téléphone"
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr "Numéro de téléphone"
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr "Action annulée"
+
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
-msgid "IP address %s"
-msgstr "Adresse IP %s"
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr "Système %s n'a pas d'adresse mac définie, ne peut pas déclencher l'action"
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr "Adresse MAC"
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr "Système %s est actuellement en cours d'installation"
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
-msgstr "Réseau"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Permission"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Vous n'êtes pas autorisé à créer un nouvel instantané pour %s."
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
-msgstr "Configuration DHCP"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Vous n'êtes pas autorisé à restaurer un instantané de %s."
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
-msgstr "Statistiques et informations sur les systèmes"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
+msgstr "Hérité de %s"
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
-msgstr "Statistiques"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
+msgstr "Gestion des systèmes"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
-msgstr "Nom d'ordinateur à utiliser par unité"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
+msgstr "Information de l’imprimante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
-msgstr "Stations de travail"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
+msgstr "Le nom de l'imprimante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
-msgstr "Stations de travail Windows"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
+msgstr "Courte description de l'imprimante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
-msgstr "Terminaux"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
+msgstr "Détails"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
-msgstr "Imprimantes"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr "Localisation de l'imprimante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
-msgstr "Téléphones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
+msgstr "La localisation de l'imprimante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
-msgstr "Composants"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr "URL de l'imprimante"
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
+msgstr "L'url de l'imprimante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
-msgstr "Téléphones portables"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr "Utilisateurs qui sont autorisés à utiliser cette imprimante"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Statistiques et informations diverses"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr "Utilisateurs qui sont autorisés à administrer cette imprimante"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
-msgstr "DHCP"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr "L'adresse ip de cet imprimante"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
-msgstr "DNS"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Adresse mac"
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
-msgstr "Configuration du plugin Systèmes"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr "L'adresse mac de cette imprimante"
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
-msgstr "Arbre LDAP des systèmes"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
+msgstr "Répertoires Windows"
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
-msgstr "Branche des systèmes"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
+msgstr "Le nom du fichier inf"
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
-msgstr "Branche où seront stockés les systèmes"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
+msgstr "Le chemin vers le fichier inf de cette imprimante"
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
-msgstr "Branche des serveurs"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
+msgstr "Répertoire du pilote d'imprimante"
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
-msgstr "Branche où seront stockés les serveurs"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
+msgstr "Le chemin vers le répertoire qui contient les drivers inf pour cette imprimante"
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
-msgstr "Branche des stations de travail"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
+msgstr "Nom du driver d'imprimante"
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
-msgstr "Branches où seront stockées les stations de travail"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
+msgstr "Nom windows de ce pilote d'imprimante"
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
-msgstr "Branche des terminaux"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
+msgstr "Information du terminal"
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
-msgstr "Branche où seront stockés les terminaux"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "terminal"
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
-msgstr "Branche des imprimantes"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
+msgstr "Le serveur racine que le terminal doit utiliser"
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
-msgstr "Branche où seront stockées les imprimantes"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
+msgstr "Le serveur de swap que le terminal doit utiliser"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
-msgstr "Branche des composants"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "Bureau distant"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
-msgstr "Branche où seront stockés les périphériques réseaux"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "Méthode de connexion"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
-msgstr "Branche des téléphones"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "Aucun"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr "Branche où seront stockés les téléphones"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr "Branche des téléphones portables"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
+msgstr "LDM"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
-msgstr "Branche où seront stockés les téléphones portables"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Divers"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
+msgstr "Telnet"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
-msgstr "Encodages disponibles pour les services de partage"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
-msgstr "Encodage"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "Serveur de terminaux"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
-msgstr "Nom de l'encodage"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
+msgstr "Il y a plusieurs serveurs Argonaut ! (ce n'est pas encore supporté)"
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-msgstr "Étiquette"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+msgstr "Il y a un serveur Argonaut en fonctionnement sur %1 (%3://%2:%4)"
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
-msgstr "Nom affiché de l'encodage"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] "Un système est configuré pour exécuter un client Argonaut."
+msgstr[1] "%1 systèmes sont configurés pour exécuter un client Argonaut."
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-msgstr "Encodages"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
+msgstr "Mais aucun système n’est configuré pour exécuter un client Argonaut !"
+
+#: 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] "Un système est configuré pour exécuter un client Argonaut, mais il n’y a pas de serveur Argonaut configuré !"
+msgstr[1] "%1 systèmes sont configurés pour exécuter un client Argonaut, mais il n’y a pas de serveur Argonaut configuré !"
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1155,45 +1170,6 @@ msgstr "Exécuter"
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr "Paramètres réseaux"
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "Adresse IP"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr "Proposer une adresse ip"
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "Adresse MAC"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr "Activer le DHCP pour ce périphérique"
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr "non configuré"
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr "Nœud parent"
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr "Éditer les paramètres"
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr "Attention : Une fois que vous importez vos hôtes OPSI dans FusionDirectory, elles seront gérées par lui, donc si vous les supprimez ou désactivez leur onglet OPSI, elle seront retirées de OPSI."
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1205,6 +1181,13 @@ msgstr "Cela inclut toutes les données des comptes, les droits d'accès, la con
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Donc - si vous êtes sûr - cliquez sur 'Supprimer' pour continuer ou sur 'Annuler' pour abandonner."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr "Attention : Une fois que vous importez vos hôtes OPSI dans FusionDirectory, elles seront gérées par lui, donc si vous les supprimez ou désactivez leur onglet OPSI, elle seront retirées de OPSI."
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtre"
@@ -1241,30 +1224,14 @@ msgstr "Afficher les périphériques réseau"
 msgid "Show mobile phones"
 msgstr "Afficher les téléphones portables"
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr "Il y a plusieurs serveurs Argonaut ! (ce n'est pas encore supporté)"
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr "Il y a un serveur Argonaut en fonctionnement sur %1 (%3://%2:%4)"
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] "Un système est configuré pour exécuter un client Argonaut."
-msgstr[1] "%1 systèmes sont configurés pour exécuter un client Argonaut."
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "Adresse IP"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr "Mais aucun système n’est configuré pour exécuter un client Argonaut !"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
+msgstr "Proposer une adresse ip"
 
-#: 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] "Un système est configuré pour exécuter un client Argonaut, mais il n’y a pas de serveur Argonaut configuré !"
-msgstr[1] "%1 systèmes sont configurés pour exécuter un client Argonaut, mais il n’y a pas de serveur Argonaut configuré !"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "Adresse MAC"
diff --git a/systems/locale/hu_HU/fusiondirectory.po b/systems/locale/hu_HU/fusiondirectory.po
index dfa1baa33f..a65e040bc8 100644
--- a/systems/locale/hu_HU/fusiondirectory.po
+++ b/systems/locale/hu_HU/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr ""
 
@@ -125,495 +288,140 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Leírás"
+
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Név"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Leírás"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr ""
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr ""
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
-msgstr ""
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Név"
 
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
@@ -623,6 +431,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr ""
@@ -631,8 +446,21 @@ msgstr ""
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
 msgstr ""
 
 #: admin/systems/class_mobilePhoneGeneric.inc:77
@@ -659,6 +487,11 @@ msgstr ""
 msgid "SimCard"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr ""
@@ -671,88 +504,141 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:152
 #, php-format
-msgid "System %s is currently installing"
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "Inherited from %s"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:72
+#, php-format
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:116
+#, php-format
+msgid "No DHCP server found for ip %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:130
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,179 +827,308 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
 #, php-format
-msgid "IP address %s"
+msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1168,6 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,30 +1222,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/id/fusiondirectory.po b/systems/locale/id/fusiondirectory.po
index 9c6e2ebb94..c6ebf26403 100644
--- a/systems/locale/id/fusiondirectory.po
+++ b/systems/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr ""
 
@@ -125,494 +288,139 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr ""
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr ""
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr ""
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr ""
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
 msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
@@ -623,6 +431,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr ""
@@ -631,8 +446,21 @@ msgstr ""
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
 msgstr ""
 
 #: admin/systems/class_mobilePhoneGeneric.inc:77
@@ -659,6 +487,11 @@ msgstr ""
 msgid "SimCard"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr ""
@@ -671,88 +504,141 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:152
 #, php-format
-msgid "System %s is currently installing"
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "Inherited from %s"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:72
+#, php-format
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:116
+#, php-format
+msgid "No DHCP server found for ip %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:130
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -937,183 +823,310 @@ msgid ""
 "to verify if the server certificates have  not  been  revoked"
 msgstr ""
 
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "LDAP"
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+msgid "LDAP"
+msgstr ""
+
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/class_systemManagement.inc:166
 #, php-format
-msgid "IP address %s"
+msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+
+#: 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] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1166,6 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1177,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,28 +1220,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
diff --git a/systems/locale/it_IT/fusiondirectory.po b/systems/locale/it_IT/fusiondirectory.po
index 5963db5176..fa2c158a01 100644
--- a/systems/locale/it_IT/fusiondirectory.po
+++ b/systems/locale/it_IT/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,175 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr "Rete"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr "Statistiche e informazioni varie"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr "DHCP"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr "DNS"
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Sistemi"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations about systems"
+msgstr "Statistiche e informazioni sui sistemi"
+
+#: addons/dashboard/class_dashBoardSystems.inc:43
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: addons/dashboard/class_dashBoardSystems.inc:48
+msgid "Computer name to use by unit"
+msgstr "Nome del computer da usare per unità"
+
+#: addons/dashboard/class_dashBoardSystems.inc:74
+msgid "Workstations"
+msgstr "Workstations"
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Servers"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr "Workstations Windows"
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr "Terminali"
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr "Stampanti"
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr "Telefoni"
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr "Componenti"
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+msgstr "Telefono cellulare"
+
+#: config/systems/class_systemsPluginConfig.inc:29
+msgid "Systems plugin configuration"
+msgstr "Configurazione del plugin systems"
+
+#: config/systems/class_systemsPluginConfig.inc:40
+msgid "LDAP tree for systems"
+msgstr "Struttura LDAP per i sistemi"
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Systems RDN"
+msgstr "RDN sistemi"
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Branch in which systems will be stored"
+msgstr "Ramo nel quale i sistemi saranno immagazzinati"
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Server RDN"
+msgstr "RDN server"
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Branch in which servers will be stored"
+msgstr "Ramo nel quale i server saranno immagazzinati"
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Workstations RDN"
+msgstr "RDN workstations"
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Branch in which workstations will be stored"
+msgstr "Ramo nel quale le workstation saranno immagazzinate"
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Terminal RDN"
+msgstr "RDN terminale"
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Branch in which terminals will be stored"
+msgstr "Ramo nel quale i terminali saranno immagazzinati"
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Printer RDN"
+msgstr "RDN stampante"
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Branch in which printers will be stored"
+msgstr "Ramo nel quale le stampanti saranno immagazzinate"
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Component RDN"
+msgstr "RDN componente"
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Branch in which network devices will be stored"
+msgstr "Ramo nel qualei dispositivi saranno immagazzinati"
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Phone RDN"
+msgstr "Telefono RDN"
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Branch in which phones will be stored"
+msgstr "Ramo nel quale i telefoni saranno immagazzinati"
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Mobile phone RDN"
+msgstr "RDN telefono cellulare"
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Branch in which mobile phones will be stored"
+msgstr "Ramo nel quale i telefoni cellulari saranno immagazzinati"
+
+#: config/systems/class_systemsPluginConfig.inc:85
+msgid "Miscellaneous"
+msgstr "Altro"
+
+#: config/systems/class_systemsPluginConfig.inc:89
+msgid "Available encodings for share services"
+msgstr "Codifiche disponibili per i servizi condivisi"
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "Encoding"
+msgstr "Codifica"
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "The encoding code name"
+msgstr "Il nome del codice di codifica"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "Label"
+msgstr "Etichetta"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
+msgstr "Il nome visualizzato per la codifica"
+
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
+msgstr "Codifiche"
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr "Attivato"
@@ -87,13 +256,7 @@ msgid "System analysis"
 msgstr "Analisi del sistema"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
@@ -126,496 +289,141 @@ msgstr "Server principale"
 msgid "Swap server"
 msgstr "Server di swap"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr "Parametri di avvio"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Server"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Kernel d'avvio"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
+msgstr "Informazioni server"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Kernel linux che dovrà essere installato ed avviato"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "server"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Parametri del kernel d'avvio"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr "Elenco dei servizi"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Parametri del kernel d'avvio da eseguire"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr "Servizi"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Avvio"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr "!"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Avvio del terminale"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Descrizione"
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Elenco dei sistemi"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Azioni"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Server bloccato"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Crea"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Workstation bloccata"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Elimina"
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Terminale bloccato"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr "Ottieni lo stato"
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Winstation"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr "Avvio"
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr "Arresto"
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Workstation"
-
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Terminale"
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Stampante"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Telefono"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr "Numero di cellulare"
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "Componente"
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr "IP"
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr "MAC"
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Descrizione"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Servizi"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "Versione"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Azioni"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Crea"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "PC Windows"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Stampante di rete"
-
-#: admin/systems/system-list.xml:233
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Periferica di rete"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "Telefono cellulare"
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr "Innesco azione"
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr "Pianifica un'azione"
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Elimina"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr "Modifica sistema"
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr "Elimina il sistema"
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr "Informazione terminale"
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr "workstation"
-
-#: admin/systems/class_workstationGeneric.inc:148
-#: admin/systems/class_phoneGeneric.inc:56
-#: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
-msgid "Properties"
-msgstr "Proprietà"
-
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr "Il nome di %s"
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr "Una breve descrizione del %s"
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Località"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr "L'ubicazione di %s"
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr "Blocca questo %s"
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr "Questo eviterà che %s venga reinstallato"
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr "Impostazioni di rete"
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr "Informazione telefono"
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr "Dispositivo telefonico"
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr "Nome del telefono"
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr "Breve descrizione del telefono"
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr "Numero di serie"
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr "Numero di serie del telefono"
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr "Numero di telefono"
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr "Numero di telefono di questo telefono"
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr "Informazioni stampante"
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr "Nome della stampante"
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr "Breve descrizione della stampante"
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr "Dettagli"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "Ubicazione della stampante"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr "Ubicazione della stampante"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "URL della stampante"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr "URL della stampante"
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr "Utenti che sono autorizzati ad utilizzare questa stampante"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr "Utenti che sono autorizzati ad amministrare questa stampante"
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr "Indirizzo IP"
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr "Indirizzo IP utilizzato dal sistema"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Indirizzo MAC"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr "Indirizzo MAC di questo sistema"
-
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr "Path per le stampanti in Windows"
-
-#: admin/systems/class_printGeneric.inc:123
-msgid "Inf file"
-msgstr "File Inf"
-
-#: admin/systems/class_printGeneric.inc:123
-msgid "Path to windows inf file for this printer"
-msgstr "Percorso verso il file inf Windows per questa stampante"
-
-#: admin/systems/class_printGeneric.inc:127
-msgid "Driver directory"
-msgstr "Driver della directory"
-
-#: admin/systems/class_printGeneric.inc:127
-msgid "Path to directory that contains windows drivers for this printer"
-msgstr "Percorso verso la directory che contiene i drivers Windows per questa stampante"
-
-#: admin/systems/class_printGeneric.inc:131
-msgid "Driver name"
-msgstr "Nome del driver"
-
-#: admin/systems/class_printGeneric.inc:131
-msgid "Windows name of the printer driver"
-msgstr "Nome Windows del driver della stampante"
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr "Servizi del server"
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Errore"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Errore di filtro"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Il filtro non è completo!"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Informazione"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr "Impossibile aggiornare lo stato del servizio prima che questo venga registrato !"
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr "Impossibile eseguire l'azione %s sul servizio %s "
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr "Informazioni terminale"
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "terminale"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Servers"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr "Il server principale che il terminale dovrebbe usare"
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "La swap principale che il terminale dovrebbe usare"
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Desktop a distanza"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Metodo di connessione"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Nessuno"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Server terminale"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr "Riavvia"
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr "Impossibile analizzare %s"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr "Modifica i servizi"
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr "Nessun server DHCP trovato per all'indirizzo IP %s"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr "Elimina il servizio"
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_networkSettings.inc:242
 #, php-format
-msgid "No DNS server found for zone %s"
-msgstr "Nessun server DNS trovato per la zona %s"
+msgid "IP address %s"
+msgstr "Indirizzo IP %s"
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "Importa"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "Indirizzo IP"
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr "Il server dal quale si vogliono importare i clienti"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "Indirizzo MAC"
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr "Informazioni server"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Impostazioni di rete"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "server"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
+msgstr "Componente"
 
 #: admin/systems/class_componentGeneric.inc:37
 msgid "Component information"
 msgstr "Informazioni sul componente"
 
+#: admin/systems/class_componentGeneric.inc:41
+#: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
+msgid "Network device"
+msgstr "Periferica di rete"
+
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_phoneGeneric.inc:56
+#: admin/systems/class_printGeneric.inc:58
+msgid "Properties"
+msgstr "Proprietà"
+
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Nome"
+
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
 msgstr "Il nome del componente"
@@ -624,6 +432,13 @@ msgstr "Il nome del componente"
 msgid "A short description of the component"
 msgstr "Una breve descrizione del componente"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr "Numero di cellulare"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr "Informazione cellulare"
@@ -636,6 +451,19 @@ msgstr "Il nome del telefonino"
 msgid "A short description of the mobile phone"
 msgstr "Una breve descrizione del telefono cellulare"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefono"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
+msgstr "Numero di serie"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The serial number of the mobile phone"
 msgstr "Il numero di serie del telefono cellulare"
@@ -660,6 +488,11 @@ msgstr "Il sistema operativo installato su questo telefono"
 msgid "SimCard"
 msgstr "Carta Sim"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr "Numero di telefono"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr "Il numero di telefono di questo telefono cellulare"
@@ -672,89 +505,142 @@ msgstr "Numero PUK"
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Il numero PUK della carta sim di questo telefono cellulare"
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
-msgstr "Elenco dei servizi"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
+msgstr "Parametri di avvio"
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr "Servizi"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "Kernel d'avvio"
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
+msgstr "Kernel linux che dovrà essere installato ed avviato"
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr "Ottieni lo stato"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
+msgstr "Parametri del kernel d'avvio"
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
+msgstr "Parametri del kernel d'avvio da eseguire"
+
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr "Avvio"
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "Arresto"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
+msgstr "Avvio del terminale"
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
-msgstr "Riavvia"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Servizi"
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr "Modifica i servizi"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
+msgstr "Servizi del server"
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr "Elimina il servizio"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Errore"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr "Errore di filtro"
+
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr "Il filtro non è completo!"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Informazione"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr "Impossibile aggiornare lo stato del servizio prima che questo venga registrato !"
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
+msgstr "Impossibile eseguire l'azione %s sul servizio %s "
+
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Workstation"
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr "Informazione terminale"
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr "workstation"
+
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
+msgstr "Il nome di %s"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
-msgstr "Azione annullata"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
+msgstr "Una breve descrizione del %s"
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Località"
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
-msgstr "Il sistema %s non ha un indirizzo MAC definito, impossibile innescare l'azione"
+msgid "The location of the %s"
+msgstr "L'ubicazione di %s"
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
-msgstr "Il sistema %s é in corso d'installazione"
+msgid "Lock this %s"
+msgstr "Blocca questo %s"
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Permessi"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr "Questo eviterà che %s venga reinstallato"
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
+msgid "Could not parse %s"
+msgstr "Impossibile analizzare %s"
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Non sei autorizzato a restaurare una 'copia instantanea' di %s."
+msgid "No DHCP server found for ip %s"
+msgstr "Nessun server DHCP trovato per all'indirizzo IP %s"
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
-msgstr "Ereditato da %s"
+msgid "No DNS server found for zone %s"
+msgstr "Nessun server DNS trovato per la zona %s"
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Sistemi"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "Importa"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
-msgstr "Gestione dei sistemi"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
+msgstr "Il server dal quale si vogliono importare i clienti"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
@@ -942,178 +828,307 @@ msgstr "Specifica se il Certificate Revocation List (CRL) del CA dovrebbe essere
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Elenco dei sistemi"
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr "Server bloccato"
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr "Workstation bloccata"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr "Terminale bloccato"
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Winstation"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Terminale"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Stampante"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr "IP"
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr "MAC"
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "Versione"
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr "PC Windows"
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "Stampante di rete"
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr "Telefono cellulare"
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr "Innesco azione"
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr "Pianifica un'azione"
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr "Modifica sistema"
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr "Elimina il sistema"
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr "Informazione telefono"
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr "Dispositivo telefonico"
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr "Nome del telefono"
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr "Breve descrizione del telefono"
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr "Numero di serie del telefono"
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr "Numero di telefono di questo telefono"
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr "Azione annullata"
+
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
-msgid "IP address %s"
-msgstr "Indirizzo IP %s"
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr "Il sistema %s non ha un indirizzo MAC definito, impossibile innescare l'azione"
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr "Indirizzo MAC"
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr "Il sistema %s é in corso d'installazione"
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
-msgstr "Rete"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Permessi"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
-msgstr "Configurazione del DHCP"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Non sei autorizzato a restaurare una 'copia instantanea' di %s."
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
-msgstr "Statistiche e informazioni sui sistemi"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
+msgstr "Ereditato da %s"
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
-msgstr "Statistiche"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
+msgstr "Gestione dei sistemi"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
-msgstr "Nome del computer da usare per unità"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
+msgstr "Informazioni stampante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
-msgstr "Workstations"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
+msgstr "Nome della stampante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
-msgstr "Workstations Windows"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
+msgstr "Breve descrizione della stampante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
-msgstr "Terminali"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
+msgstr "Dettagli"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
-msgstr "Stampanti"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr "Ubicazione della stampante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
-msgstr "Telefoni"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
+msgstr "Ubicazione della stampante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
-msgstr "Componenti"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr "URL della stampante"
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
+msgstr "URL della stampante"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
-msgstr "Telefono cellulare"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr "Utenti che sono autorizzati ad utilizzare questa stampante"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Statistiche e informazioni varie"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr "Utenti che sono autorizzati ad amministrare questa stampante"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
-msgstr "DHCP"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr "Indirizzo IP utilizzato dal sistema"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
-msgstr "DNS"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Indirizzo MAC"
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
-msgstr "Configurazione del plugin systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr "Indirizzo MAC di questo sistema"
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
-msgstr "Struttura LDAP per i sistemi"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
+msgstr "Path per le stampanti in Windows"
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
-msgstr "RDN sistemi"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
+msgstr "File Inf"
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
-msgstr "Ramo nel quale i sistemi saranno immagazzinati"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
+msgstr "Percorso verso il file inf Windows per questa stampante"
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
-msgstr "RDN server"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
+msgstr "Driver della directory"
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
-msgstr "Ramo nel quale i server saranno immagazzinati"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
+msgstr "Percorso verso la directory che contiene i drivers Windows per questa stampante"
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
-msgstr "RDN workstations"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
+msgstr "Nome del driver"
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
-msgstr "Ramo nel quale le workstation saranno immagazzinate"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
+msgstr "Nome Windows del driver della stampante"
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
-msgstr "RDN terminale"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
+msgstr "Informazioni terminale"
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
-msgstr "Ramo nel quale i terminali saranno immagazzinati"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "terminale"
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
-msgstr "RDN stampante"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
+msgstr "Il server principale che il terminale dovrebbe usare"
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
-msgstr "Ramo nel quale le stampanti saranno immagazzinate"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
+msgstr "La swap principale che il terminale dovrebbe usare"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
-msgstr "RDN componente"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "Desktop a distanza"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
-msgstr "Ramo nel qualei dispositivi saranno immagazzinati"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "Metodo di connessione"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
-msgstr "Telefono RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "Nessuno"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr "Ramo nel quale i telefoni saranno immagazzinati"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr "RDN telefono cellulare"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
+msgstr "LDM"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
-msgstr "Ramo nel quale i telefoni cellulari saranno immagazzinati"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Altro"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
+msgstr "Telnet"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
-msgstr "Codifiche disponibili per i servizi condivisi"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
-msgstr "Codifica"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "Server terminale"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
-msgstr "Il nome del codice di codifica"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
+msgstr "Ci sono diversi server Argonaut! (questo non è ancora supportato)"
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-msgstr "Etichetta"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+msgstr "C'è un server Argonaut in esecuzione su % 1 (%3://%2:%4)"
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
-msgstr "Il nome visualizzato per la codifica"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] "Solo un sistema é configurato per eseguire un cliente Argonaut"
+msgstr[1] "1% dei sistemi sono configurati per eseguire un cliente Argonaut"
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-msgstr "Codifiche"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
+msgstr "Ma nessun sistema è configurato per eseguire un client argonaut!"
+
+#: 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] " Un sistema é configurato per eseguire un cliente Argonaut, ma non c'é alcun server configurato!"
+msgstr[1] " 1% dei sistemi sono configurati per eseguire un cliente Argonaut, ma non c'é alcun server configurato!"
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1154,45 +1169,6 @@ msgstr "Esegui"
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr "Rete  impostazioni"
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "Indirizzo IP"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr "Proponi un indirizzo IP"
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "Indirizzo MAC"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr "Attiva il DHCP per questa periferica"
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr "non configurato"
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr "Nodo genitore"
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr "Modifica le impostazioni"
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr "Attenzione: una volta i sistemi OPSI importati in FustionDirectory, essi verranno gestiti da questo, percio' se cancellate o disattivate la scheda OPSI, essi verranno rimossi da OPSI"
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1204,6 +1180,13 @@ msgstr "Questo include tutti i dati degli account, i permessi di accesso al sist
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per interrompere."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr "Attenzione: una volta i sistemi OPSI importati in FustionDirectory, essi verranno gestiti da questo, percio' se cancellate o disattivate la scheda OPSI, essi verranno rimossi da OPSI"
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtro"
@@ -1240,30 +1223,14 @@ msgstr "Mostra le periferiche di rete"
 msgid "Show mobile phones"
 msgstr "Mostra i telefoni cellulari"
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr "Ci sono diversi server Argonaut! (questo non è ancora supportato)"
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr "C'è un server Argonaut in esecuzione su % 1 (%3://%2:%4)"
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] "Solo un sistema é configurato per eseguire un cliente Argonaut"
-msgstr[1] "1% dei sistemi sono configurati per eseguire un cliente Argonaut"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "Indirizzo IP"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr "Ma nessun sistema è configurato per eseguire un client argonaut!"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
+msgstr "Proponi un indirizzo IP"
 
-#: 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] " Un sistema é configurato per eseguire un cliente Argonaut, ma non c'é alcun server configurato!"
-msgstr[1] " 1% dei sistemi sono configurati per eseguire un cliente Argonaut, ma non c'é alcun server configurato!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "Indirizzo MAC"
diff --git a/systems/locale/lv/fusiondirectory.po b/systems/locale/lv/fusiondirectory.po
index e9f3f045a7..df257c81f4 100644
--- a/systems/locale/lv/fusiondirectory.po
+++ b/systems/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "LDAP kļūda"
 
@@ -125,634 +288,357 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Apraksts"
+
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Darbības"
+
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Izveidot"
+
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Noņemt"
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Tālrunis"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
 msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Vārds "
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Apraksts"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr ""
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr ""
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Darbības"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Izveidot"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Noņemt"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Atrašanās vieta"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Vārds "
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Tālrunis"
 
-#: admin/systems/class_phoneGeneric.inc:73
 #: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
 #: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Kļūda"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Informācija"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Kļūda"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Informācija"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Atrašanās vieta"
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Atļauja"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,178 +827,309 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Atļauja"
+
+#: admin/systems/class_systemManagement.inc:412
 #, php-format
-msgid "IP address %s"
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-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] ""
+msgstr[2] ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-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] ""
+msgstr[2] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1170,6 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1181,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Ja esat pārliecināts, spiediet \"izdzēst\", lai turpinātu, vai \"Atcelt\", lai pārtrauktu. "
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtrs"
@@ -1239,32 +1224,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
diff --git a/systems/locale/nb/fusiondirectory.po b/systems/locale/nb/fusiondirectory.po
index 9c8c843ea6..07c1c397ce 100644
--- a/systems/locale/nb/fusiondirectory.po
+++ b/systems/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Tjener"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
@@ -125,495 +288,140 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr ""
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Tjener"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "Tjener"
+
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Opprett"
+
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Fjern"
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Tjener"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
+msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Arbeidsstasjon"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
 msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Navn"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr ""
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr ""
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr ""
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Opprett"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Fjern"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Feil"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Tjener"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Tjener"
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
-msgstr ""
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Navn"
 
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
@@ -623,6 +431,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr ""
@@ -631,8 +446,21 @@ msgstr ""
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
 msgstr ""
 
 #: admin/systems/class_mobilePhoneGeneric.inc:77
@@ -659,6 +487,11 @@ msgstr ""
 msgid "SimCard"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr ""
@@ -671,88 +504,141 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Feil"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Arbeidsstasjon"
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:152
 #, php-format
-msgid "System %s is currently installing"
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "Inherited from %s"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:72
+#, php-format
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:116
+#, php-format
+msgid "No DHCP server found for ip %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:130
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,179 +827,308 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
 #, php-format
-msgid "IP address %s"
+msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1168,6 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filter"
@@ -1239,30 +1222,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/nl/fusiondirectory.po b/systems/locale/nl/fusiondirectory.po
index 2e19d74292..5270b62f4c 100644
--- a/systems/locale/nl/fusiondirectory.po
+++ b/systems/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr "DHCP"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr "DNS"
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Systemen"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Servers"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 "Terminal Service diverse"
+
+#: 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 "Label"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
+msgstr ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr "Geactiveerd"
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr "Systeem analyse"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "LDAP fout"
 
@@ -125,366 +288,257 @@ msgstr "Root server"
 msgid "Swap server"
 msgstr "Swap server"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr "Opstart parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Server"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Linux kernel om te installeren en te booten"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "server"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr "Lijst van diensten"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Linux kernel parameters om te draaien"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr "Dienst"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Opstarten"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr "!"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Omschrijving"
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Lijst met systemen"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Acties"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Vergrendelde server"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Aanmaken"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Vergrendelde workstation"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Verwijderen"
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Vergrendelde terminal"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Windows werkstation"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr "Start"
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr "Stop"
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr "Restart"
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr "Bewerk dienst"
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Printer"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr "Verwijder dienst"
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Telefoon"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
+msgstr "IP adres %s"
 
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr "GSM nummer"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "IP adres"
+
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "Hardware adres (MAC)"
+
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
 
-#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
 msgid "Component"
 msgstr "Component"
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Naam"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr "IP"
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr "MAC"
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Omschrijving"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Services"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "Distributie versie"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Acties"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Aanmaken"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "winStation"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Netwerk printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
+msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr "Netwerk apparatuur"
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr "Trigger actie"
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr "Plan actie"
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr "Verwijder systeem"
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr "workstation"
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr "De naam van deze %s"
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr "Een korte beschrijving van de %s"
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Plaats"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr "De locatie van de %s"
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr "Blokkeer dit %s"
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Naam"
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr "GSM nummer"
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefoon"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr "Details"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "Printer locatie"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "Printer URL"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr "Gebruikers die deze printer mogen gebruiken"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr "Gebruikers die deze printer mogen beheren"
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr "IP adres"
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Mac adress"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr "Windows paths"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
+msgstr "Opstart parameters"
 
-#: admin/systems/class_printGeneric.inc:123
-msgid "Inf file"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "Boot kernel"
 
-#: admin/systems/class_printGeneric.inc:123
-msgid "Path to windows inf file for this printer"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
+msgstr "Linux kernel om te installeren en te booten"
 
-#: admin/systems/class_printGeneric.inc:127
-msgid "Driver directory"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
+msgstr "Boot kernel parameters"
 
-#: admin/systems/class_printGeneric.inc:127
-msgid "Path to directory that contains windows drivers for this printer"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
+msgstr "Linux kernel parameters om te draaien"
 
-#: admin/systems/class_printGeneric.inc:131
-msgid "Driver name"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Opstarten"
 
-#: admin/systems/class_printGeneric.inc:131
-msgid "Windows name of the printer driver"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
+msgstr "Terminal startup"
+
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Services"
 
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
@@ -494,7 +548,6 @@ msgstr ""
 #: admin/systems/class_serverService.inc:271
 #: admin/systems/class_serverService.inc:394
 #: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
 msgid "Error"
 msgstr "Fout"
 
@@ -510,250 +563,83 @@ msgstr "De filter is niet volledig!"
 msgid "Information"
 msgstr "Informatie"
 
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr "Kan dienst status niet update zolang het niet opgeslagen is!"
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr "Kan geen actie %s niet uitvoeren op service %s."
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "terminal"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Servers"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Remote desktop"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Verbindings methode"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Geen"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Terminal server"
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "Importeren"
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "server"
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
-msgstr "Lijst van diensten"
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr "Kan dienst status niet update zolang het niet opgeslagen is!"
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr "Dienst"
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
+msgstr "Kan geen actie %s niet uitvoeren op service %s."
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr "!"
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Workstation"
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
-msgstr "Start"
-
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "Stop"
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr "workstation"
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
-msgstr "Restart"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
+msgstr "De naam van deze %s"
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr "Bewerk dienst"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
+msgstr "Een korte beschrijving van de %s"
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr "Verwijder dienst"
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Plaats"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:164
+#, php-format
+msgid "The location of the %s"
+msgstr "De locatie van de %s"
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
-msgstr ""
+msgid "Lock this %s"
+msgstr "Blokkeer dit %s"
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "System %s is currently installing"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Recht"
-
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Je hebt geen toelating om een snapshot te maken voor %s."
+msgid "Could not parse %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Je hebt geen toelating om een snapshot voor %s te restaureren."
+msgid "No DHCP server found for ip %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
-msgstr "Overgenomen van %s"
+msgid "No DNS server found for zone %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Systemen"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "Importeren"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
-msgstr "Systeem Management"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
+msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
@@ -941,178 +827,307 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
-#, php-format
-msgid "IP address %s"
-msgstr "IP adres %s"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Lijst met systemen"
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr "Hardware adres (MAC)"
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr "Vergrendelde server"
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr "Vergrendelde workstation"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr "Vergrendelde terminal"
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Windows werkstation"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Printer"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr "IP"
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr "MAC"
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "Distributie versie"
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr "winStation"
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "Netwerk printer"
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
-msgstr "DHCP configuratie"
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr "Trigger actie"
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr "Plan actie"
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr "Verwijder systeem"
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Recht"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Je hebt geen toelating om een snapshot te maken voor %s."
+
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Je hebt geen toelating om een snapshot voor %s te restaureren."
+
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
+msgstr "Overgenomen van %s"
+
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
+msgstr "Systeem Management"
+
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
+msgstr "Details"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr "Printer locatie"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr "Printer URL"
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
-msgstr "DHCP"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr "Gebruikers die deze printer mogen gebruiken"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
-msgstr "DNS"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr "Gebruikers die deze printer mogen beheren"
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Mac adress"
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
+msgstr "Windows paths"
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "terminal"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "Remote desktop"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "Verbindings methode"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "Geen"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Terminal Service diverse"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
+msgstr "LDM"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
+msgstr "Telnet"
+
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "Terminal server"
+
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-msgstr "Label"
+#: 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] ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-msgstr ""
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1168,6 @@ msgstr "Commando"
 msgid "Base"
 msgstr "Basis"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr "Netwerk instellingen"
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "IP adres"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr "IP voorstel"
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "Hardware adres (MAC)"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr "Activeer DHCP voor dit apparatuur"
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr "niet ingesteld"
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr "Parent node"
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr "Instellingen bewerken"
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr "Inclusief alle account data,system access rules,imap opties,etc. Voor de
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' om te annuleren."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filter"
@@ -1239,30 +1222,14 @@ msgstr "Toon netwerk apparaten"
 msgid "Show mobile phones"
 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] ""
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "IP adres"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
+msgstr "IP voorstel"
 
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "Hardware adres (MAC)"
diff --git a/systems/locale/pl/fusiondirectory.po b/systems/locale/pl/fusiondirectory.po
index 59e3727a1a..78189f0b7a 100644
--- a/systems/locale/pl/fusiondirectory.po
+++ b/systems/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr "DNS"
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Systemy"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Serwery"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 "Różne"
+
+#: 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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr "Aktywne"
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr "Analiza systemu"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
@@ -125,634 +288,357 @@ msgstr "Serwer NFS"
 msgid "Swap server"
 msgstr "Serwer Swap"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr ""
-
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Uruchamiane jÄ…dro"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Serwer"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr ""
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "Serwer"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Startup"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr "Usługa"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Lista systemów"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Opis"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr ""
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Akcje"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr ""
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Utwórz"
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Usuń"
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Stacja Windows"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr "Start"
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Serwer"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr "Zatrzymaj"
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Stacja robocza"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr "Restart"
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Terminal"
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Drukarka"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Telefon"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr "Edytuj usługę"
 
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr "Telefon komórkowy"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr "Usuń usługę"
 
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "ImiÄ™"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "adres IP"
 
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "Adres MAC"
 
-#: admin/systems/system-list.xml:136
-msgid "MAC"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Opis"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Usługi"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "Wersja"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Akcje"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Utwórz"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Drukarka sieciowa"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
+msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr "UrzÄ…dzenia sieciowe"
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Usuń"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "Właściwości"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Lokalizacja"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "ImiÄ™"
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr "Telefon komórkowy"
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefon"
 
-#: admin/systems/class_phoneGeneric.inc:73
 #: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr "Szczegóły"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "Lokalizacja drukarki"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "URL drukarki"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr "Użytkownicy którzy mogą używać tej drukarki"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr "Użytkownicy, którzy mogą administrować tą drukarką"
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr "adres IP"
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "Uruchamiane jÄ…dro"
 
-#: admin/systems/class_printGeneric.inc:123
-msgid "Inf file"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:123
-msgid "Path to windows inf file for this printer"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:127
-msgid "Driver directory"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:127
-msgid "Path to directory that contains windows drivers for this printer"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Startup"
 
-#: admin/systems/class_printGeneric.inc:131
-msgid "Driver name"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-msgid "Windows name of the printer driver"
-msgstr ""
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Usługi"
 
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Błąd"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Informacja"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "Terminal"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Serwery"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Zdalny pulpit"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Metoda połączenia"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Serwer terminali"
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "Import"
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Serwer"
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
-msgstr ""
-
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
-msgstr ""
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Błąd"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Informacja"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr "Usługa"
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Stacja robocza"
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
-msgstr "Start"
-
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "Zatrzymaj"
-
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
-msgstr "Restart"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
+msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr "Edytuj usługę"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
+msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr "Usuń usługę"
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Lokalizacja"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_workstationGeneric.inc:164
+#, php-format
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "System %s is currently installing"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Uprawnienie"
-
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Systemy"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "Import"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,179 +827,310 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
-#, php-format
-msgid "IP address %s"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Lista systemów"
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr "Adres MAC"
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Stacja Windows"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Drukarka"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/system-list.xml:136
+msgid "MAC"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "Wersja"
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "Drukarka sieciowa"
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Uprawnienie"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
+msgstr "Szczegóły"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr "Lokalizacja drukarki"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr "URL drukarki"
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
-msgstr "DNS"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr "Użytkownicy którzy mogą używać tej drukarki"
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr "Użytkownicy, którzy mogą administrować tą drukarką"
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "Terminal"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "Zdalny pulpit"
+
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "Metoda połączenia"
+
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Różne"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "Serwer terminali"
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: 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] ""
+msgstr[2] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1170,6 @@ msgstr "Uruchom"
 msgid "Base"
 msgstr "Kontener"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "adres IP"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "adres MAC"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1181,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby anulować."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtr"
@@ -1239,32 +1224,14 @@ msgstr "Pokaż urządzenia sieciowe"
 msgid "Show mobile phones"
 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] ""
-msgstr[2] ""
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "adres IP"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 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] ""
-msgstr[2] ""
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "adres MAC"
diff --git a/systems/locale/pt/fusiondirectory.po b/systems/locale/pt/fusiondirectory.po
index d3e560971d..f499861293 100644
--- a/systems/locale/pt/fusiondirectory.po
+++ b/systems/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Sistemas"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Servidor"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -125,495 +288,140 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Servidor"
+
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "Servidor"
+
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Descrição"
+
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Ações"
+
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Criar"
+
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Remover"
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Início"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Servidor"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Estação de trabalho"
-
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Impressora"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Fone"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
 msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Descrição"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr ""
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr ""
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Ações"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Criar"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Remover"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "Propriedades"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Localização"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Erro"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Informação"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Servidor"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Servidor"
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
-msgstr ""
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Nome"
 
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
@@ -623,6 +431,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr ""
@@ -631,8 +446,21 @@ msgstr ""
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Fone"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
 msgstr ""
 
 #: admin/systems/class_mobilePhoneGeneric.inc:77
@@ -659,6 +487,11 @@ msgstr ""
 msgid "SimCard"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr ""
@@ -671,88 +504,141 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Início"
+
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Erro"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Informação"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Estação de trabalho"
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:152
 #, php-format
-msgid "System %s is currently installing"
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Localização"
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "Inherited from %s"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Sistemas"
+#: admin/systems/class_systemImport.inc:72
+#, php-format
+msgid "Could not parse %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:116
+#, php-format
+msgid "No DHCP server found for ip %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:130
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,179 +827,308 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Impressora"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
 #, php-format
-msgid "IP address %s"
+msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1168,6 @@ msgstr ""
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Então, se você tem certeza, pressione 'Deletar' para continuar ou 'Cancelar' para abortar."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,30 +1222,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/pt_BR/fusiondirectory.po b/systems/locale/pt_BR/fusiondirectory.po
index e939a7150f..2b9ff58abd 100644
--- a/systems/locale/pt_BR/fusiondirectory.po
+++ b/systems/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr ""
 
@@ -125,494 +288,139 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr ""
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr ""
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr ""
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr ""
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Endereço MAC"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr ""
-
-#: 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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Nenhum"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
 msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
@@ -623,6 +431,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr ""
@@ -635,6 +450,19 @@ msgstr ""
 msgid "A short description of the mobile phone"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The serial number of the mobile phone"
 msgstr ""
@@ -659,6 +487,11 @@ msgstr ""
 msgid "SimCard"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr ""
@@ -671,88 +504,141 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:152
 #, php-format
-msgid "System %s is currently installing"
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "Inherited from %s"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:72
+#, php-format
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:116
+#, php-format
+msgid "No DHCP server found for ip %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:130
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,178 +827,307 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:412
 #, php-format
-msgid "IP address %s"
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Endereço MAC"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "Nenhum"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-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] ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-msgstr ""
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1168,6 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,30 +1222,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/ru/fusiondirectory.po b/systems/locale/ru/fusiondirectory.po
index c58002c18e..814870337c 100644
--- a/systems/locale/ru/fusiondirectory.po
+++ b/systems/locale/ru/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,175 @@ 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"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr "Сеть"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr "Статистика и различная информация"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr "DHCP"
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr "DNS"
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Системы"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr "Рабочие станции"
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Серверы"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr "Рабочие станции Windows"
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr "Терминалы"
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr "Принтеры"
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr "Телефоны"
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 "RDN для систем"
+
+#: 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 "RDN для серверов"
+
+#: 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 "RDN для рабочих стаций"
+
+#: 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 "RDN для терминалов"
+
+#: 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 "RDN для принтеров"
+
+#: 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 "RDN для компонентов"
+
+#: 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 "RDN для телефонов"
+
+#: 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 "RDN для мобильных телефонов"
+
+#: 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 "Кодировки"
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -88,13 +257,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
@@ -127,495 +290,140 @@ msgstr "Основной сервер"
 msgid "Swap server"
 msgstr "Сервер подкачки"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr "Параметры запуска"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Сервер"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Ядро для загрузки"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
+msgstr "Информация о сервере"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Linux ядро, которое установлено и загружено"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "Сервер"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Параметры загрузки ядра"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Параметры с которыми Linux ядро было запущено"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr "Service"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Запуск"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr "!"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Описание"
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Список систем"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Действия"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Создать"
+
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+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/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Рабочая станция Windows"
-
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Сервер"
-
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Рабочая станция"
-
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Терминал"
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Принтер"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Телефон"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr "Мобильный телефон"
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Название"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr "IP"
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr "MAC"
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Описание"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Сервисы"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr ""
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Действия"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Создать"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Сетевой принтер"
-
-#: admin/systems/system-list.xml:233
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Сетевое устройство"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "Мобильный телефон"
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr "Действие по триггеру"
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr "Действие по расписанию"
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Удалить"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr "Редактировать систему"
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr "Удалить систему"
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr "Информация об рабочей станции"
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr "рабочая станция"
-
-#: admin/systems/class_workstationGeneric.inc:148
-#: admin/systems/class_phoneGeneric.inc:56
-#: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
-msgid "Properties"
-msgstr "Свойства"
-
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr "Название %s"
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr "Краткое описание %s"
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Местоположение"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr "Местоположение %s"
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr "Сетевые настройки"
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr "Информация об телеофоне"
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr "Название телефона"
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr "Краткое описание телефона"
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr "Серийный номер"
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr "Серийный номер телефона"
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr "Номер телефона"
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr "Телефонный номер у этого телефона"
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr "Информация о принтере"
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr "Название принтера"
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr "Краткое описание принтера"
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr "Детали"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "Местонахождение принтера"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr "Расположение принтера"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "URL принтера"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr "URL принтера"
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr "Пользователи, которым разрешено использовать этот принтер"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr "Пользователи, которым разрешено администрировать этот принтер"
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr "IP адрес"
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Mac адрес"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:119
-msgid "Windows paths"
-msgstr "Пути windows"
-
-#: admin/systems/class_printGeneric.inc:123
-msgid "Inf file"
-msgstr "Inf файл"
-
-#: admin/systems/class_printGeneric.inc:123
-msgid "Path to windows inf file for this printer"
-msgstr "Путь к inf файлу windows для этого принтера"
-
-#: 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 "Путь к директории, которая содержит windows драйвер для этого принтера"
-
-#: 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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Ошибка"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Ошибка фильтра"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Фильтр неполный!"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Информация"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Серверы"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "Удаленная рабочая станция"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "Способ подключения"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Оболочка"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "IP адрес"
 
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "Терминал-сервер"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "MAC адрес"
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Сетевые настройки"
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr "Не найден DNS сервер для зоны %s"
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "Импортировать"
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr "Информация о сервере"
+#: admin/systems/class_componentGeneric.inc:41
+#: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
+msgid "Network device"
+msgstr "Сетевое устройство"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Сервер"
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:148
+#: admin/systems/class_phoneGeneric.inc:56
+#: admin/systems/class_printGeneric.inc:58
+msgid "Properties"
+msgstr "Свойства"
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
-msgstr ""
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Название"
 
 #: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
@@ -625,6 +433,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr "Мобильный телефон"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr "Информация о мобильном телефоне"
@@ -637,6 +452,19 @@ msgstr "Название мобильного телефона"
 msgid "A short description of the mobile phone"
 msgstr "Краткое описание мобильного телефона"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Телефон"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
+msgstr "Серийный номер"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The serial number of the mobile phone"
 msgstr "Серийный номер мобильного телефона"
@@ -661,6 +489,11 @@ msgstr "Операционная система установленная на
 msgid "SimCard"
 msgstr "СимКарта"
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr "Номер телефона"
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr "Телефонный номер мобильного телефона"
@@ -673,88 +506,141 @@ msgstr "PUK номер"
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "PUK номер сим карты в мобильном телефоне "
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
+msgstr "Параметры запуска"
+
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "Ядро для загрузки"
+
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
+msgstr "Linux ядро, которое установлено и загружено"
+
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
+msgstr "Параметры загрузки ядра"
+
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
+msgstr "Параметры с которыми Linux ядро было запущено"
+
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Запуск"
+
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr "Service"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Сервисы"
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr "!"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
+msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr "Получить статус"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Ошибка"
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
-msgstr "Запустить"
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr "Ошибка фильтра"
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "Остановить"
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr "Фильтр неполный!"
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
-msgstr "Перезапустить"
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Информация"
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Рабочая станция"
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr "Информация об рабочей станции"
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr "рабочая станция"
+
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
+msgstr "Название %s"
+
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
+msgstr "Краткое описание %s"
+
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Местоположение"
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:164
+#, php-format
+msgid "The location of the %s"
+msgstr "Местоположение %s"
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "System %s is currently installing"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Права"
-
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Вам не разрешено создавать снапшот для %s."
+msgid "Could not parse %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Вам не разрешено восстанавливать снапшот для %s."
+msgid "No DHCP server found for ip %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
-msgstr ""
+msgid "No DNS server found for zone %s"
+msgstr "Не найден DNS сервер для зоны %s"
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Системы"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "Импортировать"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -943,178 +829,311 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
-#, php-format
-msgid "IP address %s"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Список систем"
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr "MAC адрес"
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
-msgstr "Сеть"
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Рабочая станция Windows"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Терминал"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Принтер"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr "IP"
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr "MAC"
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/system-list.xml:209
+msgid "winStation"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
-msgstr "Статистика"
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "Сетевой принтер"
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr "Мобильный телефон"
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr "Действие по триггеру"
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr "Действие по расписанию"
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr "Редактировать систему"
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr "Удалить систему"
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr "Информация об телеофоне"
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
-msgstr "Рабочие станции"
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr "Название телефона"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
-msgstr "Рабочие станции Windows"
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr "Краткое описание телефона"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
-msgstr "Терминалы"
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr "Серийный номер телефона"
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
-msgstr "Принтеры"
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr "Телефонный номер у этого телефона"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
-msgstr "Телефоны"
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Права"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Вам не разрешено создавать снапшот для %s."
+
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Вам не разрешено восстанавливать снапшот для %s."
+
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
+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 "URL принтера"
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
+msgstr "URL принтера"
+
+#: 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 "Пользователи, которым разрешено администрировать этот принтер"
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
-msgstr "Мобильные телефоны"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
-msgstr "Статистика и различная информация"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Mac адрес"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
-msgstr "DHCP"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
-msgstr "DNS"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
+msgstr "Пути windows"
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
+msgstr "Inf файл"
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
+msgstr "Путь к inf файлу windows для этого принтера"
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
-msgstr "RDN для систем"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
+msgstr "Директория драйвера"
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
-msgstr "Ветка, в которой системы будут храниться"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
+msgstr "Путь к директории, которая содержит windows драйвер для этого принтера"
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
-msgstr "RDN для серверов"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
+msgstr "Имя драйвера"
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
-msgstr "Ветка в которой будут храниться сервера"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
-msgstr "RDN для рабочих стаций"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
-msgstr "Ветка в которй будут храниться рабочие станции"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
-msgstr "RDN для терминалов"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
-msgstr "Ветка в которой будут храниться терминалы"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
-msgstr "RDN для принтеров"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "Удаленная рабочая станция"
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
-msgstr "Ветка в которой будут храниться принтеры"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "Способ подключения"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
-msgstr "RDN для компонентов"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
-msgstr "Ветка в которой сетевые устройства будут храниться"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
-msgstr "RDN для телефонов"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
+msgstr "LDM"
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr "Ветка, в которой телефоны будут храниться"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Оболочка"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr "RDN для мобильных телефонов"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
+msgstr "Telnet"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
-msgstr "Ветка в которой будут храниться мобильные телефоны"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Разное"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "Терминал-сервер"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
-msgstr "Кодировка"
-
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
-msgstr "Название кодировки"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-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] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
-msgstr "Отображаемое имя кодировки"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
+msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-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] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1155,45 +1174,6 @@ msgstr "Выполнить"
 msgid "Base"
 msgstr "Суффикс"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr "Сетевые настройки"
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "IP-адрес"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "MAC-адрес"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr "Включить DHCP для этого устройства"
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr "не настроен"
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr "Редактировать настройки"
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1205,6 +1185,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Итак - если вы уверены - нажмите 'Удалить', чтобы продолжить или 'Отмена' чтобы прервать."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Фильтр"
@@ -1241,34 +1228,14 @@ msgstr "Показывать сетевые устройства"
 msgid "Show mobile phones"
 msgstr "Показывать мобильные телефоны"
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-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] ""
-msgstr[2] ""
-msgstr[3] ""
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "IP-адрес"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 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] ""
-msgstr[2] ""
-msgstr[3] ""
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "MAC-адрес"
diff --git a/systems/locale/ru@petr1708/fusiondirectory.po b/systems/locale/ru@petr1708/fusiondirectory.po
index 3d8056f8ad..619451f5bb 100644
--- a/systems/locale/ru@petr1708/fusiondirectory.po
+++ b/systems/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ 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"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr ""
 
@@ -125,634 +288,357 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr ""
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr ""
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr ""
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr ""
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
 #: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
 #: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,178 +827,311 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:412
 #, php-format
-msgid "IP address %s"
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-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] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-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] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1172,6 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1183,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,34 +1226,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
diff --git a/systems/locale/sv/fusiondirectory.po b/systems/locale/sv/fusiondirectory.po
index 686b91ce58..2e3d6a2a43 100644
--- a/systems/locale/sv/fusiondirectory.po
+++ b/systems/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "System"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Server"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 "Diverse"
+
+#: 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 "Etikett"
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
+msgstr ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
@@ -125,634 +288,357 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
-msgstr "Uppstartsparametrar"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Server"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "Bootkärna"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
-msgstr "Linuxkärna att installera och starta upp"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "Server"
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
-msgstr "Parametrar för Bootkärna"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
-msgstr "Linux kärnparametrar att köra"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Starta upp"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Beskrivning"
+
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Åtgärder"
+
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Skapa"
+
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Ta bort"
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Winstation"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Server"
-
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Arbetsstation"
-
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Terminal"
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Skrivare"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Telefon"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Namn"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
-msgid "MAC"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Beskrivning"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "Tjänster"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "Release"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Åtgärder"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Skapa"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Ta bort"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Plats"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Namn"
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefon"
 
-#: admin/systems/class_phoneGeneric.inc:73
 #: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
 #: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Fel"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Filterfel"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Filtret är inte komplett!"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Information"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "Terminal"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Server"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr "Ingen"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Skal"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
+msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Server"
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
+msgstr "Uppstartsparametrar"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "Bootkärna"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
+msgstr "Linuxkärna att installera och starta upp"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
+msgstr "Parametrar för Bootkärna"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
+msgstr "Linux kärnparametrar att köra"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Starta upp"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
-msgstr ""
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "Tjänster"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
-msgstr ""
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Fel"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
-msgstr ""
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr "Filterfel"
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
-msgstr ""
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr "Filtret är inte komplett!"
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
-msgstr ""
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Information"
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Arbetsstation"
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Plats"
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Rättighet"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Du har inte tillåtelse att skapa en ögonblicksbild för %s."
+msgid "Could not parse %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Du är inte tillåten att återskapa en ögonblicksbild för %s."
+msgid "No DHCP server found for ip %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "System"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,178 +827,307 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Winstation"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Skrivare"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "Release"
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Rättighet"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Du har inte tillåtelse att skapa en ögonblicksbild för %s."
+
+#: admin/systems/class_systemManagement.inc:475
 #, php-format
-msgid "IP address %s"
-msgstr ""
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Du är inte tillåten att återskapa en ögonblicksbild för %s."
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "Terminal"
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
+msgstr "Ingen"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Skal"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "Diverse"
-
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-msgstr "Etikett"
+#: 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] ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-msgstr ""
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1168,6 @@ msgstr "Exekvera"
 msgid "Base"
 msgstr "Bas"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr "Föräldranod"
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1179,13 @@ msgstr "Detta inkluderar alla kontodata, systemrättighetsregler, imapinställni
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Så - om du är säker - tryck 'Ta bort' för att fortsätta och 'Avbryt' för att avbryta."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filter"
@@ -1239,30 +1222,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/ug/fusiondirectory.po b/systems/locale/ug/fusiondirectory.po
index e0a56c7d34..9c13472c16 100644
--- a/systems/locale/ug/fusiondirectory.po
+++ b/systems/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr ""
 
@@ -125,494 +288,139 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
-
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr ""
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr ""
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr ""
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
 msgstr ""
 
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr ""
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
 msgstr ""
 
 #: admin/systems/class_componentGeneric.inc:63
@@ -623,6 +431,13 @@ msgstr ""
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:37
 msgid "Mobile phone information"
 msgstr ""
@@ -631,8 +446,21 @@ msgstr ""
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "Serial Number"
 msgstr ""
 
 #: admin/systems/class_mobilePhoneGeneric.inc:77
@@ -659,6 +487,11 @@ msgstr ""
 msgid "SimCard"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
+msgstr ""
+
 #: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The telephone number of the mobile phone"
 msgstr ""
@@ -671,88 +504,141 @@ msgstr ""
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:152
 #, php-format
-msgid "System %s is currently installing"
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_workstationGeneric.inc:171
 #, php-format
-msgid "Inherited from %s"
+msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
+#: admin/systems/class_systemImport.inc:72
+#, php-format
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:116
+#, php-format
+msgid "No DHCP server found for ip %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:130
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -937,183 +823,310 @@ msgid ""
 "to verify if the server certificates have  not  been  revoked"
 msgstr ""
 
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "LDAP"
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+msgid "LDAP"
+msgstr ""
+
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/class_systemManagement.inc:166
 #, php-format
-msgid "IP address %s"
+msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+
+#: 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] ""
+
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -1153,45 +1166,6 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1177,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,28 +1220,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
diff --git a/systems/locale/vi_VN/fusiondirectory.po b/systems/locale/vi_VN/fusiondirectory.po
index 1506a1af53..811d58fc57 100644
--- a/systems/locale/vi_VN/fusiondirectory.po
+++ b/systems/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "Các hệ thống"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "Máy chủ (server)"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr ""
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
@@ -125,634 +288,357 @@ msgstr ""
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "Máy chủ (server)"
+
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "Máy chủ (server)"
+
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "Mô tả"
+
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "Các thao tác"
+
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "Tạo "
+
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "Xóa bỏ"
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Khởi động"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "Máy chủ (server)"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "Máy trạm"
-
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "Thiết bị cuối "
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "Máy in"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "Số điện thoại"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
 msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "Tên"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
-msgstr ""
-
-#: admin/systems/system-list.xml:136
-msgid "MAC"
-msgstr ""
-
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "Mô tả"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr ""
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr ""
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "Các thao tác"
-
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "Tạo "
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "Xóa bỏ"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "Properties"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "Vị trí"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "Tên"
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "Số điện thoại"
 
-#: admin/systems/class_phoneGeneric.inc:73
 #: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
 #: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "Lá»—i"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "Thông tin"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "Thiết bị cuối "
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "Máy chủ (server)"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
-msgstr ""
-
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Máy chủ (server)"
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "Khởi động"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "Lá»—i"
+
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "Thông tin"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "Máy trạm"
+
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "Vị trí"
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "Cho phép"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Bạn không được phép tạo ra snapshot cho %s."
+msgid "Could not parse %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Bạn không được phép phục hồi một snapshot cho %s."
+msgid "No DHCP server found for ip %s"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "Các hệ thống"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,178 +827,305 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "Thiết bị cuối "
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Máy in"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "Cho phép"
+
+#: admin/systems/class_systemManagement.inc:412
 #, php-format
-msgid "IP address %s"
-msgstr ""
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Bạn không được phép tạo ra snapshot cho %s."
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr ""
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Bạn không được phép phục hồi một snapshot cho %s."
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "Thiết bị cuối "
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-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] ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-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] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1166,6 @@ msgstr ""
 msgid "Base"
 msgstr "Cơ sở"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1177,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "Vì thế nếu bạn chắc chắn hãy nhấn \"Xóa bỏ\" để tiếp tục hoặc'Hủy bỏ' để dừng lại."
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
@@ -1239,28 +1220,14 @@ msgstr ""
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
 msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
diff --git a/systems/locale/zh/fusiondirectory.po b/systems/locale/zh/fusiondirectory.po
index f2ecd026ae..300a225636 100644
--- a/systems/locale/zh/fusiondirectory.po
+++ b/systems/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
-"PO-Revision-Date: 2016-09-27 16:12+0000\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
+"PO-Revision-Date: 2016-11-02 22:09+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,175 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+#: admin/systems/class_networkSettings.inc:324
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:40
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:45
+msgid "DNS"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+#: config/systems/class_systemsPluginConfig.inc:28
+#: admin/systems/class_systemManagement.inc:694
+#: admin/systems/class_systemManagement.inc:698
+msgid "Systems"
+msgstr "系统设置"
+
+#: addons/dashboard/class_dashBoardSystems.inc:32
+msgid "Statistics and informations 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:74
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+#: admin/systems/class_terminalGeneric.inc:62
+msgid "Servers"
+msgstr "服务器"
+
+#: addons/dashboard/class_dashBoardSystems.inc:80
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:83
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:86
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:92
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:95
+msgid "Mobile phones"
+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 ""
+
 #: admin/ogroups/goto/class_termgroup.inc:68
 msgid "Activated"
 msgstr "活动"
@@ -86,13 +255,7 @@ msgid "System analysis"
 msgstr "系统分析"
 
 #: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:282
-#: admin/systems/class_networkSettings.inc:427
-#: admin/systems/class_networkSettings.inc:486
-#: admin/systems/class_networkSettings.inc:505
-#: admin/systems/class_networkSettings.inc:522
-#: admin/systems/class_networkSettings.inc:531
-#: admin/systems/class_networkSettings.inc:549
+#: admin/systems/class_networkSettings.inc:314
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
@@ -125,634 +288,357 @@ msgstr "根服务器"
 msgid "Swap server"
 msgstr "交换服务器"
 
-#: admin/systems/class_terminalStartup.inc:63
-msgid "Startup parameters"
+#: admin/systems/class_serverGeneric.inc:32
+#: admin/systems/class_serverGeneric.inc:37
+#: admin/systems/class_serverGeneric.inc:38
+#: admin/systems/class_systemImport.inc:169 admin/systems/system-list.xml:46
+#: admin/systems/system-list.xml:185
+msgid "Server"
+msgstr "服务器"
+
+#: admin/systems/class_serverGeneric.inc:33
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Boot kernel"
-msgstr "启动内核"
+#: admin/systems/class_serverGeneric.inc:55
+msgid "server"
+msgstr "服务器"
 
-#: admin/systems/class_terminalStartup.inc:66
-msgid "Linux kernel to be installed and booted"
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Boot kernel parameters"
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
-msgid "Linux kernel parameters to be ran"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "启动"
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_workstationGeneric.inc:157
+#: admin/systems/services/shares/class_serviceShare.inc:56
+#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_printGeneric.inc:66
+msgid "Description"
+msgstr "描述"
 
-#: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+msgid "Actions"
+msgstr "动作"
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "系统列表"
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+msgid "Create"
+msgstr "创建"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr ""
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+msgid "Remove"
+msgstr "删除"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Windows 工作站"
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr "停止"
 
-#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:185
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:32
-#: admin/systems/class_serverGeneric.inc:37
-#: admin/systems/class_serverGeneric.inc:38
-msgid "Server"
-msgstr "服务器"
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr ""
 
-#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:118
-#: admin/systems/class_workstationGeneric.inc:123
-#: admin/systems/class_workstationGeneric.inc:124
-msgid "Workstation"
-msgstr "工作站"
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr ""
 
-#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
-#: admin/systems/class_terminalGeneric.inc:32
-#: admin/systems/class_terminalGeneric.inc:37
-#: admin/systems/class_terminalGeneric.inc:38
-msgid "Terminal"
-msgstr "终端"
-
-#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
-#: admin/systems/class_printGeneric.inc:35
-#: admin/systems/class_printGeneric.inc:36
-msgid "Printer"
-msgstr "打印机"
-
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
-#: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-msgid "Phone"
-msgstr "电话"
-
-#: admin/systems/system-list.xml:86
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-msgid "Mobile phone"
-msgstr "移动电话"
-
-#: admin/systems/system-list.xml:94
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/system-list.xml:120
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_phoneGeneric.inc:59
-#: admin/systems/class_printGeneric.inc:62
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:29
-msgid "Name"
-msgstr "名称"
-
-#: admin/systems/system-list.xml:128
-msgid "IP"
+#: admin/systems/class_networkSettings.inc:242
+#, php-format
+msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
-msgid "MAC"
+#: admin/systems/class_networkSettings.inc:250
+#: admin/systems/class_networkSettings.inc:256
+#: admin/systems/class_networkSettings.inc:258
+#: admin/systems/class_networkSettings.inc:331
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/system-list.xml:144
-#: admin/systems/class_workstationGeneric.inc:157
-#: admin/systems/class_phoneGeneric.inc:63
-#: admin/systems/class_printGeneric.inc:66
-#: admin/systems/class_componentGeneric.inc:67
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-#: admin/systems/serverService-list.xml:35
-#: admin/systems/services/shares/class_serviceShare.inc:56
-msgid "Description"
-msgstr "描述"
-
-#: admin/systems/system-list.xml:152 admin/systems/class_serverService.inc:57
-#: admin/systems/services/terminal/class_serviceTerminal.inc:30
-#: admin/systems/services/shares/class_serviceShare.inc:31
-#: admin/systems/services/ldap/class_serviceLDAP.inc:97
-msgid "Services"
-msgstr "服务"
-
-#: admin/systems/system-list.xml:160
-msgid "Release"
-msgstr "发行"
-
-#: admin/systems/system-list.xml:168 admin/systems/serverService-list.xml:43
-msgid "Actions"
-msgstr "动作"
+#: admin/systems/class_networkSettings.inc:265
+#: admin/systems/class_networkSettings.inc:267
+#: admin/systems/class_networkSettings.inc:332
+msgid "MAC address"
+msgstr "MAC 地址"
 
-#: admin/systems/system-list.xml:179 admin/systems/serverService-list.xml:54
-msgid "Create"
-msgstr "创建"
+#: admin/systems/class_networkSettings.inc:325
+#: admin/systems/class_componentGeneric.inc:74
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:182
+#: admin/systems/class_phoneGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/system-list.xml:94
+msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "网络打印机"
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Component information"
+msgstr ""
 
-#: admin/systems/system-list.xml:233
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
+#: admin/systems/system-list.xml:233
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
-msgid "Trigger action"
-msgstr ""
-
-#: admin/systems/system-list.xml:260
-msgid "Schedule action"
-msgstr ""
-
-#: admin/systems/system-list.xml:272 admin/systems/serverService-list.xml:69
-msgid "Remove"
-msgstr "删除"
-
-#: admin/systems/system-list.xml:303
-msgid "Edit system"
-msgstr ""
-
-#: admin/systems/system-list.xml:316
-msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:119
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:141
-msgid "workstation"
-msgstr ""
-
+#: admin/systems/class_componentGeneric.inc:60
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/class_workstationGeneric.inc:148
 #: admin/systems/class_phoneGeneric.inc:56
 #: admin/systems/class_printGeneric.inc:58
-#: admin/systems/class_componentGeneric.inc:60
-#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr "属性"
 
-#: admin/systems/class_workstationGeneric.inc:152
-#, php-format
-msgid "The name of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:158
-#, php-format
-msgid "A short description of the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:163
-msgid "Location"
-msgstr "位置"
-
-#: admin/systems/class_workstationGeneric.inc:164
-#, php-format
-msgid "The location of the %s"
-msgstr ""
+#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_workstationGeneric.inc:151
+#: admin/systems/services/shares/class_serviceShare.inc:52
+#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/system-filter.tpl.c:29
+msgid "Name"
+msgstr "名称"
 
-#: admin/systems/class_workstationGeneric.inc:170
-#, php-format
-msgid "Lock this %s"
+#: admin/systems/class_componentGeneric.inc:63
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:171
-#, php-format
-msgid "This will prevent the %s from being reinstalled"
+#: admin/systems/class_componentGeneric.inc:67
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:182
-#: admin/systems/class_phoneGeneric.inc:83
-#: admin/systems/class_printGeneric.inc:103
-#: admin/systems/class_componentGeneric.inc:74
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:562
-msgid "Network settings"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:36
+#: admin/systems/class_mobilePhoneGeneric.inc:41
+#: admin/systems/class_mobilePhoneGeneric.inc:42
+#: admin/systems/system-list.xml:86
+msgid "Mobile phone"
+msgstr "移动电话"
 
-#: admin/systems/class_phoneGeneric.inc:37
-msgid "Phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
-msgid "Phone hardware"
+#: admin/systems/class_mobilePhoneGeneric.inc:63
+msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
-msgid "The name of the phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:67
+msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
-msgid "A short description of the phone"
-msgstr ""
+#: admin/systems/class_mobilePhoneGeneric.inc:74
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:40
+#: admin/systems/class_phoneGeneric.inc:70
+msgid "Phone"
+msgstr "电话"
 
-#: admin/systems/class_phoneGeneric.inc:73
 #: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "Serial Number"
-msgstr ""
-
 #: admin/systems/class_phoneGeneric.inc:73
-msgid "The serial number of the phone"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "Telephone Number"
-msgstr ""
-
-#: admin/systems/class_phoneGeneric.inc:77
-msgid "The telephone number of the phone"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:31
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:62
-msgid "The name of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:66
-msgid "A short description of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:72
-msgid "Details"
-msgstr "详细"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "Printer location"
-msgstr "打印机位置"
-
-#: admin/systems/class_printGeneric.inc:75
-msgid "The location of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "Printer URL"
-msgstr "打印机 URL"
-
-#: admin/systems/class_printGeneric.inc:79
-msgid "The URL of the printer"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:85
-#: admin/systems/class_printGeneric.inc:88
-msgid "Users which are allowed to use this printer"
-msgstr "允许使用该打印机的用户"
-
-#: admin/systems/class_printGeneric.inc:94
-#: admin/systems/class_printGeneric.inc:97
-msgid "Users which are allowed to administrate this printer"
-msgstr "允许管理该打印机的用户"
-
-#: admin/systems/class_printGeneric.inc:108
-#: admin/systems/class_networkSettings.inc:356
-#: admin/systems/class_networkSettings.inc:369
-#: admin/systems/class_networkSettings.inc:371
-#: admin/systems/class_networkSettings.inc:568
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-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_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:225
-#: admin/systems/class_serverService.inc:271
-#: admin/systems/class_serverService.inc:394
-#: admin/systems/services/shares/class_serviceShare.inc:104
-#: admin/systems/class_networkSettings.inc:236
-msgid "Error"
-msgstr "错误"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
-msgid "Information"
-msgstr "提示信息"
-
-#: admin/systems/class_serverService.inc:388
-msgid "Cannot update service status until it has been saved!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
-msgstr "终端"
-
-#: admin/systems/class_terminalGeneric.inc:62
-#: addons/dashboard/class_dashBoardSystems.inc:77
-msgid "Servers"
-msgstr "服务器"
-
-#: admin/systems/class_terminalGeneric.inc:67
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:73
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:80
-msgid "Remote desktop"
-msgstr "远程桌面"
-
-#: admin/systems/class_terminalGeneric.inc:84
-msgid "Connect method"
-msgstr "连接方法"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "None"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:88
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:92
-msgid "Terminal server"
-msgstr "终端服务器"
-
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
-msgstr "导入"
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_mobilePhoneGeneric.inc:81
+msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
-msgid "Server information"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "OS"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "服务器"
-
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_mobilePhoneGeneric.inc:86
+msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
-msgid "The name of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:92
+msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
-msgid "Mobile phone information"
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-msgid "The name of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
-msgid "A short description of the mobile phone"
+#: admin/systems/class_mobilePhoneGeneric.inc:99
+msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-msgid "The serial number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "IMEI Number"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Boot kernel"
+msgstr "启动内核"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
-msgid "The IMEI number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:66
+msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "OS"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
-msgid "The Operating System installed on this phone"
+#: admin/systems/class_terminalStartup.inc:70
+msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
-msgid "SimCard"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:82
+msgid "Startup"
+msgstr "启动"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-msgid "The telephone number of the mobile phone"
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Terminal startup"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "PUK Number"
-msgstr ""
+#: admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/system-list.xml:152
+msgid "Services"
+msgstr "服务"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
-msgid "The PUK number of the simcard in this mobile phone"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:10
-msgid "List of services"
-msgstr ""
+#: admin/systems/class_serverService.inc:225
+#: admin/systems/class_serverService.inc:271
+#: admin/systems/class_serverService.inc:394
+#: admin/systems/services/shares/class_serviceShare.inc:104
+msgid "Error"
+msgstr "错误"
 
-#: admin/systems/serverService-list.xml:14
-msgid "Service"
+#: admin/systems/class_serverService.inc:333
+msgid "Filter error"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
+#: admin/systems/class_serverService.inc:333
+msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
+#: admin/systems/class_serverService.inc:388
+msgid "Information"
+msgstr "提示信息"
+
+#: admin/systems/class_serverService.inc:388
+msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:97
-msgid "Start"
+#: admin/systems/class_serverService.inc:416
+#: admin/systems/class_serverService.inc:425
+#: admin/systems/class_serverService.inc:436
+#, php-format
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/serverService-list.xml:105
-msgid "Stop"
-msgstr "停止"
+#: admin/systems/class_workstationGeneric.inc:118
+#: admin/systems/class_workstationGeneric.inc:123
+#: admin/systems/class_workstationGeneric.inc:124
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:193
+msgid "Workstation"
+msgstr "工作站"
 
-#: admin/systems/serverService-list.xml:113
-msgid "Restart"
+#: admin/systems/class_workstationGeneric.inc:119
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
+#: admin/systems/class_workstationGeneric.inc:141
+msgid "workstation"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
+#: admin/systems/class_workstationGeneric.inc:152
+#, php-format
+msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
-#: admin/systems/class_systemManagement.inc:166
-msgid "Action canceled"
+#: admin/systems/class_workstationGeneric.inc:158
+#, php-format
+msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_workstationGeneric.inc:163
+msgid "Location"
+msgstr "位置"
+
+#: admin/systems/class_workstationGeneric.inc:164
 #, php-format
-msgid "System %s has no mac address defined, cannot trigger action"
+msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:166
+#: admin/systems/class_workstationGeneric.inc:170
 #, php-format
-msgid "System %s is currently installing"
+msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:242
-#: admin/systems/class_systemManagement.inc:318
-#: admin/systems/class_systemManagement.inc:412
-#: admin/systems/class_systemManagement.inc:475
-msgid "Permission"
-msgstr "允许"
+#: admin/systems/class_workstationGeneric.inc:171
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr ""
 
-#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:475
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:641
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid "Inherited from %s"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:694
-#: admin/systems/class_systemManagement.inc:698
-#: addons/dashboard/class_dashBoardSystems.inc:31
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr "系统设置"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
+msgstr "导入"
 
-#: admin/systems/class_systemManagement.inc:695
-msgid "Systems Management"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
@@ -941,178 +827,305 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:348
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "系统列表"
+
+#: admin/systems/system-list.xml:14
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:22
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Winstation"
+msgstr "Windows 工作站"
+
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:201
+#: admin/systems/class_terminalGeneric.inc:32
+#: admin/systems/class_terminalGeneric.inc:37
+#: admin/systems/class_terminalGeneric.inc:38
+msgid "Terminal"
+msgstr "终端"
+
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "打印机"
+
+#: admin/systems/system-list.xml:128
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:136
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:160
+msgid "Release"
+msgstr "发行"
+
+#: admin/systems/system-list.xml:209
+msgid "winStation"
+msgstr ""
+
+#: admin/systems/system-list.xml:217
+msgid "Network printer"
+msgstr "网络打印机"
+
+#: admin/systems/system-list.xml:241
+msgid "Mobile Phone"
+msgstr ""
+
+#: admin/systems/system-list.xml:253
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:260
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:303
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:316
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:41
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:59
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:63
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:77
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
+#: admin/systems/class_systemManagement.inc:166
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
-msgid "IP address %s"
+msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:362
-#: admin/systems/class_networkSettings.inc:378
-#: admin/systems/class_networkSettings.inc:380
-#: admin/systems/class_networkSettings.inc:569
-msgid "MAC address"
-msgstr "MAC 地址"
+#: admin/systems/class_systemManagement.inc:166
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
 
-#: admin/systems/class_networkSettings.inc:561
-#: addons/dashboard/class_dashBoardNetwork.inc:28
-msgid "Network"
+#: admin/systems/class_systemManagement.inc:242
+#: admin/systems/class_systemManagement.inc:318
+#: admin/systems/class_systemManagement.inc:412
+#: admin/systems/class_systemManagement.inc:475
+msgid "Permission"
+msgstr "允许"
+
+#: admin/systems/class_systemManagement.inc:412
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:475
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:641
+#, php-format
+msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:575
-msgid "DHCP configuration"
+#: admin/systems/class_systemManagement.inc:695
+msgid "Systems Management"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:32
-msgid "Statistics and informations about systems"
+#: admin/systems/class_printGeneric.inc:31
+msgid "Printer information"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:43
-msgid "Statistics"
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Computer name to use by unit"
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:74
-msgid "Workstations"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
+msgstr "详细"
 
-#: addons/dashboard/class_dashBoardSystems.inc:80
-msgid "Windows Workstations"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr "打印机位置"
 
-#: addons/dashboard/class_dashBoardSystems.inc:83
-msgid "Terminals"
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:86
-msgid "Printers"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr "打印机 URL"
 
-#: addons/dashboard/class_dashBoardSystems.inc:89
-msgid "Phones"
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:92
-msgid "Components"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr "允许使用该打印机的用户"
 
-#: addons/dashboard/class_dashBoardSystems.inc:95
-msgid "Mobile phones"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr "允许管理该打印机的用户"
 
-#: addons/dashboard/class_dashBoardNetwork.inc:29
-msgid "Statistics and various informations"
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:40
-msgid "DHCP"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardNetwork.inc:45
-msgid "DNS"
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:29
-msgid "Systems plugin configuration"
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:40
-msgid "LDAP tree for systems"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Systems RDN"
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:43
-msgid "Branch in which systems will be stored"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Server RDN"
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:48
-msgid "Branch in which servers will be stored"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Workstations RDN"
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:53
-msgid "Branch in which workstations will be stored"
+#: admin/systems/class_terminalGeneric.inc:33
+msgid "Terminal information"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Terminal RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:55
+msgid "terminal"
+msgstr "终端"
 
-#: config/systems/class_systemsPluginConfig.inc:58
-msgid "Branch in which terminals will be stored"
+#: admin/systems/class_terminalGeneric.inc:67
+#, php-format
+msgid "The root server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Printer RDN"
+#: admin/systems/class_terminalGeneric.inc:73
+#, php-format
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:63
-msgid "Branch in which printers will be stored"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:80
+msgid "Remote desktop"
+msgstr "远程桌面"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Component RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:84
+msgid "Connect method"
+msgstr "连接方法"
 
-#: config/systems/class_systemsPluginConfig.inc:68
-msgid "Branch in which network devices will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "None"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Phone RDN"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "XDMCP"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:73
-msgid "Branch in which phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "LDM"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Mobile phone RDN"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Shell"
+msgstr "Shell"
 
-#: config/systems/class_systemsPluginConfig.inc:78
-msgid "Branch in which mobile phones will be stored"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Telnet"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:85
-msgid "Miscellaneous"
-msgstr "杂项"
+#: admin/systems/class_terminalGeneric.inc:88
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: config/systems/class_systemsPluginConfig.inc:89
-msgid "Available encodings for share services"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:92
+msgid "Terminal server"
+msgstr "终端服务器"
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "Encoding"
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:93
-msgid "The encoding code name"
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "Label"
-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] ""
 
-#: config/systems/class_systemsPluginConfig.inc:98
-msgid "The encoding displayed name"
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
 msgstr ""
 
-#: config/systems/class_systemsPluginConfig.inc:106
-msgid "Encodings"
-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] ""
 
 #: admin/ogroups/goto/termgroup.tpl.c:5
 msgid ""
@@ -1153,45 +1166,6 @@ msgstr "执行"
 msgid "Base"
 msgstr "位置"
 
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "IP 地址"
-
-#: admin/systems/network.tpl.c:8
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:11
-msgid "MAC-address"
-msgstr "MAC 地址"
-
-#: admin/systems/network.tpl.c:14 admin/systems/network.tpl.c:17
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:23
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/server_import.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for"
@@ -1203,6 +1177,13 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以,如果您确定,请按“删除”继续,否则按“取消”退出。"
 
+#: admin/systems/server_import.tpl.c:2
+msgid ""
+"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
+" managed by it, so if you delete them or deactivate their OPSI tab, they "
+"will be removed from OPSI."
+msgstr ""
+
 #: admin/systems/system-filter.tpl.c:2
 msgid "Filter"
 msgstr "过滤器"
@@ -1239,28 +1220,14 @@ msgstr "显示网络设备"
 msgid "Show mobile phones"
 msgstr ""
 
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-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] ""
+#: admin/systems/network.tpl.c:2
+msgid "IP-address"
+msgstr "IP 地址"
 
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
+#: admin/systems/network.tpl.c:5
+msgid "Propose ip"
 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] ""
+#: admin/systems/network.tpl.c:8
+msgid "MAC-address"
+msgstr "MAC 地址"
diff --git a/user-reminder/locale/ar/fusiondirectory.po b/user-reminder/locale/ar/fusiondirectory.po
index 098710c833..928b44249b 100644
--- a/user-reminder/locale/ar/fusiondirectory.po
+++ b/user-reminder/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,24 +17,6 @@ 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"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/ca/fusiondirectory.po b/user-reminder/locale/ca/fusiondirectory.po
index 2a3828fec6..c3304713e0 100644
--- a/user-reminder/locale/ca/fusiondirectory.po
+++ b/user-reminder/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/cs_CZ/fusiondirectory.po b/user-reminder/locale/cs_CZ/fusiondirectory.po
index 2bbe37e16a..9ebdf3ee4b 100644
--- a/user-reminder/locale/cs_CZ/fusiondirectory.po
+++ b/user-reminder/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr "tato poukázka (token) je neplatná"
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Nastal problém s poštovním serverem – obraťte se na svého správce systémů."
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr "Účet s uživatelským jménem %s nebyl nalezen"
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr "Bylo nalezeno hned několik účtů s uživatelským jménem %s"
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr "tato poukázka (token) je neplatná"
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Nastal problém s poštovním serverem – obraťte se na svého správce systémů."
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr "Účet s uživatelským jménem %s nebyl nalezen"
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr "Bylo nalezeno hned několik účtů s uživatelským jménem %s"
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/de/fusiondirectory.po b/user-reminder/locale/de/fusiondirectory.po
index 353aa55f22..156cf47b92 100644
--- a/user-reminder/locale/de/fusiondirectory.po
+++ b/user-reminder/locale/de/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr "Das Token ist nicht gültig"
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr "Das Token ist nicht gültig"
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/el_GR/fusiondirectory.po b/user-reminder/locale/el_GR/fusiondirectory.po
index ca2d6a83f6..92a0c7a0c4 100644
--- a/user-reminder/locale/el_GR/fusiondirectory.po
+++ b/user-reminder/locale/el_GR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/es/fusiondirectory.po b/user-reminder/locale/es/fusiondirectory.po
index 1de7b9fb63..7c2da8ce80 100644
--- a/user-reminder/locale/es/fusiondirectory.po
+++ b/user-reminder/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr "Esta prenda es invalida"
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr "Esta prenda es invalida"
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/es_CO/fusiondirectory.po b/user-reminder/locale/es_CO/fusiondirectory.po
index c120b6e0a3..3d0eec8d0c 100644
--- a/user-reminder/locale/es_CO/fusiondirectory.po
+++ b/user-reminder/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr "Este token es inválido"
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contacte a su administrador, hubo un problema con el servidor de correo."
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr "No se encontró la cuenta de usuario: \"%s\""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr "Se encontraron varias cuentas identificadas como: \"%s\""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr "Este token es inválido"
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Contacte a su administrador, hubo un problema con el servidor de correo."
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr "No se encontró la cuenta de usuario: \"%s\""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr "Se encontraron varias cuentas identificadas como: \"%s\""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/es_VE/fusiondirectory.po b/user-reminder/locale/es_VE/fusiondirectory.po
index 1e80ef280c..5cf65feafd 100644
--- a/user-reminder/locale/es_VE/fusiondirectory.po
+++ b/user-reminder/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr "Esta prenda es invalida"
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr "Esta prenda es invalida"
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/fa_IR/fusiondirectory.po b/user-reminder/locale/fa_IR/fusiondirectory.po
index ea2909eb9d..16c7f8d715 100644
--- a/user-reminder/locale/fa_IR/fusiondirectory.po
+++ b/user-reminder/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/fi_FI/fusiondirectory.po b/user-reminder/locale/fi_FI/fusiondirectory.po
index 453dc7c9ce..411166f07b 100644
--- a/user-reminder/locale/fi_FI/fusiondirectory.po
+++ b/user-reminder/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/fr/fusiondirectory.po b/user-reminder/locale/fr/fusiondirectory.po
index 81e7a5d22e..e0a55f63be 100644
--- a/user-reminder/locale/fr/fusiondirectory.po
+++ b/user-reminder/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-10 08:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -18,24 +18,6 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr "Le jeton n'est pas valide"
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contactez votre administrateur système, il y a eu un problème avec le serveur de courriel"
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr "Aucun compte utilisateur trouvé avec l'identifiant \"%s\""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr "Plusieurs comptes trouvés avec l’identifiant \"%s\""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr "Rappel d'expiration des comptes"
@@ -160,6 +142,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr "Cher %1$s,\n\nl'expiration de votre compte %2$s a été prolongé avec succès.\n\n"
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr "Le jeton n'est pas valide"
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Contactez votre administrateur système, il y a eu un problème avec le serveur de courriel"
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr "Aucun compte utilisateur trouvé avec l'identifiant \"%s\""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr "Plusieurs comptes trouvés avec l’identifiant \"%s\""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/hu_HU/fusiondirectory.po b/user-reminder/locale/hu_HU/fusiondirectory.po
index 59ed767b1c..e0a1a10b2d 100644
--- a/user-reminder/locale/hu_HU/fusiondirectory.po
+++ b/user-reminder/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/id/fusiondirectory.po b/user-reminder/locale/id/fusiondirectory.po
index 7fc065d8c1..8c40a7658a 100644
--- a/user-reminder/locale/id/fusiondirectory.po
+++ b/user-reminder/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/it_IT/fusiondirectory.po b/user-reminder/locale/it_IT/fusiondirectory.po
index 5ce443e93d..e44ad2f96f 100644
--- a/user-reminder/locale/it_IT/fusiondirectory.po
+++ b/user-reminder/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 14:39+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -18,24 +18,6 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr "Questo token non è valido"
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contattare l'amministratore, c'è stato un problema con il server di posta elettronica"
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr "Alcun account trovato con login \"%s\" "
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr "Trovati più accounts con login \"%s\""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr "Promemoria per l'utente"
@@ -160,6 +142,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr "Caro %1$s,\nla data di scadenza del tuo acccount %2$s é stata rinviata con successo.\n"
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr "Questo token non è valido"
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Contattare l'amministratore, c'è stato un problema con il server di posta elettronica"
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr "Alcun account trovato con login \"%s\" "
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr "Trovati più accounts con login \"%s\""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/lv/fusiondirectory.po b/user-reminder/locale/lv/fusiondirectory.po
index 64f1d5f633..1eb7fe4aaf 100644
--- a/user-reminder/locale/lv/fusiondirectory.po
+++ b/user-reminder/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/nb/fusiondirectory.po b/user-reminder/locale/nb/fusiondirectory.po
index 4743bcb621..47c24d2c77 100644
--- a/user-reminder/locale/nb/fusiondirectory.po
+++ b/user-reminder/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/nl/fusiondirectory.po b/user-reminder/locale/nl/fusiondirectory.po
index 2e6b4b9597..b7d980eeee 100644
--- a/user-reminder/locale/nl/fusiondirectory.po
+++ b/user-reminder/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr "Deze token is niet geldig"
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr "Deze token is niet geldig"
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/pl/fusiondirectory.po b/user-reminder/locale/pl/fusiondirectory.po
index 2c41f1d46a..f6f160641f 100644
--- a/user-reminder/locale/pl/fusiondirectory.po
+++ b/user-reminder/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/pt/fusiondirectory.po b/user-reminder/locale/pt/fusiondirectory.po
index 72f56ba4bf..bae3437e1c 100644
--- a/user-reminder/locale/pt/fusiondirectory.po
+++ b/user-reminder/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/pt_BR/fusiondirectory.po b/user-reminder/locale/pt_BR/fusiondirectory.po
index 5d3f4ce1b0..acc1dfb46a 100644
--- a/user-reminder/locale/pt_BR/fusiondirectory.po
+++ b/user-reminder/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Entre em contato com o administrador, houve um problema com o servidor de e-mail."
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Entre em contato com o administrador, houve um problema com o servidor de e-mail."
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/ru/fusiondirectory.po b/user-reminder/locale/ru/fusiondirectory.po
index f72207cb22..472aad72e4 100644
--- a/user-reminder/locale/ru/fusiondirectory.po
+++ b/user-reminder/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-12 05:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,24 +17,6 @@ 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"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Свяжитесь с вашим системным администратором, были проблемы с почтовым сервером"
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr "Не найден аккаунт с логином \"%s\""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr "Найдено множество учетных записей с логином \"%s\""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Свяжитесь с вашим системным администратором, были проблемы с почтовым сервером"
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr "Не найден аккаунт с логином \"%s\""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr "Найдено множество учетных записей с логином \"%s\""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/ru@petr1708/fusiondirectory.po b/user-reminder/locale/ru@petr1708/fusiondirectory.po
index 6dacff7ae7..ebfdf1a389 100644
--- a/user-reminder/locale/ru@petr1708/fusiondirectory.po
+++ b/user-reminder/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,24 +17,6 @@ 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"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/sv/fusiondirectory.po b/user-reminder/locale/sv/fusiondirectory.po
index 6ee2672c6a..d8fab6d052 100644
--- a/user-reminder/locale/sv/fusiondirectory.po
+++ b/user-reminder/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Kontakta din administratör, det uppstod ett problem med epostservern"
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr "Kontakta din administratör, det uppstod ett problem med epostservern"
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/ug/fusiondirectory.po b/user-reminder/locale/ug/fusiondirectory.po
index 66005100b5..80e23ffb6c 100644
--- a/user-reminder/locale/ug/fusiondirectory.po
+++ b/user-reminder/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/vi_VN/fusiondirectory.po b/user-reminder/locale/vi_VN/fusiondirectory.po
index c9da7e8a5e..61224966b0 100644
--- a/user-reminder/locale/vi_VN/fusiondirectory.po
+++ b/user-reminder/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/user-reminder/locale/zh/fusiondirectory.po b/user-reminder/locale/zh/fusiondirectory.po
index 6e82b80ba7..aeef83c2eb 100644
--- a/user-reminder/locale/zh/fusiondirectory.po
+++ b/user-reminder/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: html/class_expiredUserPostpone.inc:58
-msgid "This token is invalid"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:195
-msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:206
-#, php-format
-msgid "Did not find an account with login \"%s\""
-msgstr ""
-
-#: html/class_expiredUserPostpone.inc:209
-#, php-format
-msgid "Found multiple accounts with login \"%s\""
-msgstr ""
-
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
 msgstr ""
@@ -159,6 +141,24 @@ msgid ""
 " your account %2$s expiration has been successfully postponed.\n"
 msgstr ""
 
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:195
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:206
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:209
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
diff --git a/weblink/locale/ar/fusiondirectory.po b/weblink/locale/ar/fusiondirectory.po
index 29f9ca2ab7..c8dfc732e0 100644
--- a/weblink/locale/ar/fusiondirectory.po
+++ b/weblink/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
diff --git a/weblink/locale/ca/fusiondirectory.po b/weblink/locale/ca/fusiondirectory.po
index 387f9942a5..284469ff36 100644
--- a/weblink/locale/ca/fusiondirectory.po
+++ b/weblink/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
diff --git a/weblink/locale/cs_CZ/fusiondirectory.po b/weblink/locale/cs_CZ/fusiondirectory.po
index 411d2af4ab..64e36dc879 100644
--- a/weblink/locale/cs_CZ/fusiondirectory.po
+++ b/weblink/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
diff --git a/weblink/locale/de/fusiondirectory.po b/weblink/locale/de/fusiondirectory.po
index d09e99987f..0dca247eb7 100644
--- a/weblink/locale/de/fusiondirectory.po
+++ b/weblink/locale/de/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
diff --git a/weblink/locale/el_GR/fusiondirectory.po b/weblink/locale/el_GR/fusiondirectory.po
index 92cc85f95d..2f622df291 100644
--- a/weblink/locale/el_GR/fusiondirectory.po
+++ b/weblink/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
diff --git a/weblink/locale/es/fusiondirectory.po b/weblink/locale/es/fusiondirectory.po
index e3344403ea..c9ffd2746e 100644
--- a/weblink/locale/es/fusiondirectory.po
+++ b/weblink/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
diff --git a/weblink/locale/es_CO/fusiondirectory.po b/weblink/locale/es_CO/fusiondirectory.po
index a922e43b4b..51c827e44b 100644
--- a/weblink/locale/es_CO/fusiondirectory.po
+++ b/weblink/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
diff --git a/weblink/locale/es_VE/fusiondirectory.po b/weblink/locale/es_VE/fusiondirectory.po
index c2acb5891e..03523b0c1e 100644
--- a/weblink/locale/es_VE/fusiondirectory.po
+++ b/weblink/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
diff --git a/weblink/locale/fa_IR/fusiondirectory.po b/weblink/locale/fa_IR/fusiondirectory.po
index aac336151b..c1e794a150 100644
--- a/weblink/locale/fa_IR/fusiondirectory.po
+++ b/weblink/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
diff --git a/weblink/locale/fi_FI/fusiondirectory.po b/weblink/locale/fi_FI/fusiondirectory.po
index 0cacd717d3..34c768cd4b 100644
--- a/weblink/locale/fi_FI/fusiondirectory.po
+++ b/weblink/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
diff --git a/weblink/locale/fr/fusiondirectory.po b/weblink/locale/fr/fusiondirectory.po
index 5e3970d128..6f6019eecd 100644
--- a/weblink/locale/fr/fusiondirectory.po
+++ b/weblink/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
diff --git a/weblink/locale/hu_HU/fusiondirectory.po b/weblink/locale/hu_HU/fusiondirectory.po
index 3a2426062a..2890ed9cc6 100644
--- a/weblink/locale/hu_HU/fusiondirectory.po
+++ b/weblink/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
diff --git a/weblink/locale/id/fusiondirectory.po b/weblink/locale/id/fusiondirectory.po
index d9ec195e77..2b3af30b6f 100644
--- a/weblink/locale/id/fusiondirectory.po
+++ b/weblink/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
diff --git a/weblink/locale/it_IT/fusiondirectory.po b/weblink/locale/it_IT/fusiondirectory.po
index bb69e0f7c7..852bed60c4 100644
--- a/weblink/locale/it_IT/fusiondirectory.po
+++ b/weblink/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 15:30+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
diff --git a/weblink/locale/lv/fusiondirectory.po b/weblink/locale/lv/fusiondirectory.po
index a8a52db792..80f3f4d445 100644
--- a/weblink/locale/lv/fusiondirectory.po
+++ b/weblink/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
diff --git a/weblink/locale/nb/fusiondirectory.po b/weblink/locale/nb/fusiondirectory.po
index b0ccd4bde6..affbe0c020 100644
--- a/weblink/locale/nb/fusiondirectory.po
+++ b/weblink/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
diff --git a/weblink/locale/nl/fusiondirectory.po b/weblink/locale/nl/fusiondirectory.po
index 9127690ea2..ccce28de33 100644
--- a/weblink/locale/nl/fusiondirectory.po
+++ b/weblink/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
diff --git a/weblink/locale/pl/fusiondirectory.po b/weblink/locale/pl/fusiondirectory.po
index 0415ddeeab..48cfb95636 100644
--- a/weblink/locale/pl/fusiondirectory.po
+++ b/weblink/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
diff --git a/weblink/locale/pt/fusiondirectory.po b/weblink/locale/pt/fusiondirectory.po
index c27ff56361..0a5df10ae8 100644
--- a/weblink/locale/pt/fusiondirectory.po
+++ b/weblink/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
diff --git a/weblink/locale/pt_BR/fusiondirectory.po b/weblink/locale/pt_BR/fusiondirectory.po
index fc55a11de2..e4277d9d17 100644
--- a/weblink/locale/pt_BR/fusiondirectory.po
+++ b/weblink/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
diff --git a/weblink/locale/ru/fusiondirectory.po b/weblink/locale/ru/fusiondirectory.po
index 453a09e61e..decbb5187f 100644
--- a/weblink/locale/ru/fusiondirectory.po
+++ b/weblink/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:07+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
diff --git a/weblink/locale/ru@petr1708/fusiondirectory.po b/weblink/locale/ru@petr1708/fusiondirectory.po
index 9f6c356f57..db26610f4f 100644
--- a/weblink/locale/ru@petr1708/fusiondirectory.po
+++ b/weblink/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
diff --git a/weblink/locale/sv/fusiondirectory.po b/weblink/locale/sv/fusiondirectory.po
index a07d4e4fdf..d8990bff81 100644
--- a/weblink/locale/sv/fusiondirectory.po
+++ b/weblink/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
diff --git a/weblink/locale/ug/fusiondirectory.po b/weblink/locale/ug/fusiondirectory.po
index 8fabc3cee0..da9460ae54 100644
--- a/weblink/locale/ug/fusiondirectory.po
+++ b/weblink/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
diff --git a/weblink/locale/vi_VN/fusiondirectory.po b/weblink/locale/vi_VN/fusiondirectory.po
index 6257873602..234e96cb48 100644
--- a/weblink/locale/vi_VN/fusiondirectory.po
+++ b/weblink/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
diff --git a/weblink/locale/zh/fusiondirectory.po b/weblink/locale/zh/fusiondirectory.po
index 81687afd94..a4d7cd08e0 100644
--- a/weblink/locale/zh/fusiondirectory.po
+++ b/weblink/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
diff --git a/webservice/locale/ar/fusiondirectory.po b/webservice/locale/ar/fusiondirectory.po
index e90a9a9498..be1f606fae 100644
--- a/webservice/locale/ar/fusiondirectory.po
+++ b/webservice/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr ""
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/ca/fusiondirectory.po b/webservice/locale/ca/fusiondirectory.po
index 7a65cfa7b9..0ebd10b239 100644
--- a/webservice/locale/ca/fusiondirectory.po
+++ b/webservice/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ca\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr "Connector"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/cs_CZ/fusiondirectory.po b/webservice/locale/cs_CZ/fusiondirectory.po
index 4cab8d1252..726afe8ea5 100644
--- a/webservice/locale/cs_CZ/fusiondirectory.po
+++ b/webservice/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr "Nastavení webové služby"
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr "Nastavení zásuvného modulu webová služba pro FusionDirectory"
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr "Webová služba"
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr "Vynutit SSL"
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr "Přijímat JSON-RPC požadavky pouze přes HTTPS"
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr "Nelze nalézt soubor %s – opravte to spuštěním %s (na serveru)."
 msgid "Plugin"
 msgstr "Zásuvný modul"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "%s nelze smazat. Je uzamčeno %s."
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr "Nastavení webové služby"
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr "Nastavení zásuvného modulu webová služba pro FusionDirectory"
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr "Webová služba"
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr "Vynutit SSL"
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr "Přijímat JSON-RPC požadavky pouze přes HTTPS"
diff --git a/webservice/locale/de/fusiondirectory.po b/webservice/locale/de/fusiondirectory.po
index 45ea6f204d..f2ad778dd9 100644
--- a/webservice/locale/de/fusiondirectory.po
+++ b/webservice/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr "Webdienstkonfiguration"
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr "Webdienst"
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr "SSL erzwingen"
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr "Nur HTTPS JSON-RPC-Anfragen erlauben"
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -32,42 +52,22 @@ msgstr "Konnte Datei '%s' nicht finden - bitte führen Sie '%s' aus um das Probl
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr "Webdienstkonfiguration"
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr "Webdienst"
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr "SSL erzwingen"
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr "Nur HTTPS JSON-RPC-Anfragen erlauben"
diff --git a/webservice/locale/el_GR/fusiondirectory.po b/webservice/locale/el_GR/fusiondirectory.po
index c7e3cde8de..582bdefd16 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-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
@@ -18,6 +18,26 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr "Ρύθμιση Webservice"
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr "Ρύθμιση προσθέτου FusionDirectory webservice"
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr "Webservice"
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr "Εξαναγκασμός SSL"
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr "Να επιτρέπονται μόνο αιτήσεις HTTPS JSON-RPC"
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -32,42 +52,22 @@ msgstr "Αδυναμία εντοπισμού αρχείου '%s' - παρακα
 msgid "Plugin"
 msgstr "Πρόσθετο"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "Αδυναμία διαγραφής %s. Έχει κλειδωθεί από το  %s."
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr "Ρύθμιση Webservice"
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr "Ρύθμιση προσθέτου FusionDirectory webservice"
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr "Webservice"
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr "Εξαναγκασμός SSL"
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr "Να επιτρέπονται μόνο αιτήσεις HTTPS JSON-RPC"
diff --git a/webservice/locale/es/fusiondirectory.po b/webservice/locale/es/fusiondirectory.po
index fdfbc51cc6..2b3c851875 100644
--- a/webservice/locale/es/fusiondirectory.po
+++ b/webservice/locale/es/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para solu
 msgid "Plugin"
 msgstr "Extensión"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/es_CO/fusiondirectory.po b/webservice/locale/es_CO/fusiondirectory.po
index 8c82c57356..229a9ab2a2 100644
--- a/webservice/locale/es_CO/fusiondirectory.po
+++ b/webservice/locale/es_CO/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es_CO\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr "No se encuentra el archivo '%s' - por favor ejecute '%s' para  arreglar
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/es_VE/fusiondirectory.po b/webservice/locale/es_VE/fusiondirectory.po
index 129ddbd464..bfba22404f 100644
--- a/webservice/locale/es_VE/fusiondirectory.po
+++ b/webservice/locale/es_VE/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: es_VE\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para solu
 msgid "Plugin"
 msgstr "Extensión"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/fa_IR/fusiondirectory.po b/webservice/locale/fa_IR/fusiondirectory.po
index 1734749f4e..e876a8f237 100644
--- a/webservice/locale/fa_IR/fusiondirectory.po
+++ b/webservice/locale/fa_IR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: fa_IR\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr "فایل '%s' را نمی توانم پیدا کنم برای رفع م
 msgid "Plugin"
 msgstr "پلاگین"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/fi_FI/fusiondirectory.po b/webservice/locale/fi_FI/fusiondirectory.po
index 65bc2b9706..58e499e375 100644
--- a/webservice/locale/fi_FI/fusiondirectory.po
+++ b/webservice/locale/fi_FI/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: fi_FI\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/fr/fusiondirectory.po b/webservice/locale/fr/fusiondirectory.po
index daac73cc39..133cc49de5 100644
--- a/webservice/locale/fr/fusiondirectory.po
+++ b/webservice/locale/fr/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
@@ -19,6 +19,26 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr "Configuration du service Web"
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr "Configuration du plugin webservice"
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr "Service Web"
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr "Forcer le SSL"
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr "Ne permettre que les connexions JSON-RPC en HTTPS"
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -33,42 +53,22 @@ msgstr "Fichier '%s' non trouvé - veuillez exécuter '%s' pour régler ce probl
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "Impossible d’effacer %s. Il a été verrouillé par %s."
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, 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:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr "Méthode de mot de passe \"%s\" a échoué. Le compte \"%s\" n'a pas été verrouillé!"
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr "Impossible de trouver le compte \"%s\" dans LDAP. Il n'a pas été verrouillé!"
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr "Configuration du service Web"
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr "Configuration du plugin webservice"
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr "Service Web"
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr "Forcer le SSL"
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr "Ne permettre que les connexions JSON-RPC en HTTPS"
diff --git a/webservice/locale/hu_HU/fusiondirectory.po b/webservice/locale/hu_HU/fusiondirectory.po
index aecad38a93..bca47b1cec 100644
--- a/webservice/locale/hu_HU/fusiondirectory.po
+++ b/webservice/locale/hu_HU/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: hu_HU\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/id/fusiondirectory.po b/webservice/locale/id/fusiondirectory.po
index 39e5d66750..aee53d8f77 100644
--- a/webservice/locale/id/fusiondirectory.po
+++ b/webservice/locale/id/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: id\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/it_IT/fusiondirectory.po b/webservice/locale/it_IT/fusiondirectory.po
index 4763ad8596..a473c46e2b 100644
--- a/webservice/locale/it_IT/fusiondirectory.po
+++ b/webservice/locale/it_IT/fusiondirectory.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-09-02 14:39+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
@@ -19,6 +19,26 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr "Configurazione Webservice"
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr "Configurazione del plugin Webservice di FusionDirectory"
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr "Webservice"
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr "Forza l'SSL"
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr "Permetti soltanto richieste HTTPS JSON-RPC "
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -33,42 +53,22 @@ msgstr "Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al prob
 msgid "Plugin"
 msgstr "Estensione"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, 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:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, 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:560
+#: html/jsonrpc.php:563
 #, 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:567
+#: html/jsonrpc.php:570
 #, 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!"
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr "Configurazione Webservice"
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr "Configurazione del plugin Webservice di FusionDirectory"
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr "Webservice"
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr "Forza l'SSL"
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr "Permetti soltanto richieste HTTPS JSON-RPC "
diff --git a/webservice/locale/lv/fusiondirectory.po b/webservice/locale/lv/fusiondirectory.po
index c2e07db161..9522e89b46 100644
--- a/webservice/locale/lv/fusiondirectory.po
+++ b/webservice/locale/lv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr ""
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/nb/fusiondirectory.po b/webservice/locale/nb/fusiondirectory.po
index d7f2461b8e..c02f1955cd 100644
--- a/webservice/locale/nb/fusiondirectory.po
+++ b/webservice/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: nb\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/nl/fusiondirectory.po b/webservice/locale/nl/fusiondirectory.po
index 913ffedb34..46bbc83f20 100644
--- a/webservice/locale/nl/fusiondirectory.po
+++ b/webservice/locale/nl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: nl\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr "Kan bestand '%s' niet vinden - gebruik aub '%s' om dit op te lossen"
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/pl/fusiondirectory.po b/webservice/locale/pl/fusiondirectory.po
index 005f2030b2..7de55a36a2 100644
--- a/webservice/locale/pl/fusiondirectory.po
+++ b/webservice/locale/pl/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr ""
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr "Dodatek"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/pt/fusiondirectory.po b/webservice/locale/pt/fusiondirectory.po
index bad45174fa..e49cb7339b 100644
--- a/webservice/locale/pt/fusiondirectory.po
+++ b/webservice/locale/pt/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pt\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/pt_BR/fusiondirectory.po b/webservice/locale/pt_BR/fusiondirectory.po
index db606fb094..9efc1469f6 100644
--- a/webservice/locale/pt_BR/fusiondirectory.po
+++ b/webservice/locale/pt_BR/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: pt_BR\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr "Não foi possível localizar o arquivo '%s' - execute '%s' para solucion
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/ru/fusiondirectory.po b/webservice/locale/ru/fusiondirectory.po
index 401e9a55d9..93ddfb15c5 100644
--- a/webservice/locale/ru/fusiondirectory.po
+++ b/webservice/locale/ru/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-08-08 19:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr ""
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr "Не могу обнаружить файл '%s' - пожалуйста
 msgid "Plugin"
 msgstr "Плагин"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/ru@petr1708/fusiondirectory.po b/webservice/locale/ru@petr1708/fusiondirectory.po
index 7825609711..93cb1a4074 100644
--- a/webservice/locale/ru@petr1708/fusiondirectory.po
+++ b/webservice/locale/ru@petr1708/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr ""
+
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/sv/fusiondirectory.po b/webservice/locale/sv/fusiondirectory.po
index f0f8f42116..c3fa580e23 100644
--- a/webservice/locale/sv/fusiondirectory.po
+++ b/webservice/locale/sv/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: sv\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr "Kan inte lokalisera filen '%s' - vänligen kör '%s' för att åtgärda
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/ug/fusiondirectory.po b/webservice/locale/ug/fusiondirectory.po
index 4422ea8ec2..202f1742b0 100644
--- a/webservice/locale/ug/fusiondirectory.po
+++ b/webservice/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: ug\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/vi_VN/fusiondirectory.po b/webservice/locale/vi_VN/fusiondirectory.po
index 6008f68566..72a455d2f0 100644
--- a/webservice/locale/vi_VN/fusiondirectory.po
+++ b/webservice/locale/vi_VN/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: vi_VN\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr "Không thể xác định vị trí file '%s'- xin hãy chạy '%s' đ
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
diff --git a/webservice/locale/zh/fusiondirectory.po b/webservice/locale/zh/fusiondirectory.po
index 793afd549f..980dd2c6d1 100644
--- a/webservice/locale/zh/fusiondirectory.po
+++ b/webservice/locale/zh/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-06-28 11:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
@@ -17,6 +17,26 @@ msgstr ""
 "Language: zh\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:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
@@ -31,42 +51,22 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:488
+#: html/jsonrpc.php:491
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:535 html/jsonrpc.php:564
+#: html/jsonrpc.php:538 html/jsonrpc.php:567
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:560
+#: html/jsonrpc.php:563
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:567
+#: html/jsonrpc.php:570
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
-
-#: config/class_webserviceConfig.inc:28
-msgid "Webservice configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:29
-msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:42
-msgid "Webservice"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Force SSL"
-msgstr ""
-
-#: config/class_webserviceConfig.inc:45
-msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
-- 
GitLab


From 62a7bd5a2180e74649acb57cf3a13c3a1cb77e8d Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Mon, 7 Nov 2016 22:55:32 +0100
Subject: [PATCH 41/54] Cleaning minor sonar code compliance Move this trailing
 comment on the previous empty line

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 .../alias/class_mailAliasDistribution.inc     |  5 ++-
 .../alias/class_mailAliasRedirection.inc      |  5 ++-
 .../addons/argonaut/class_argonautQueue.inc   |  4 +--
 argonaut/include/class_supportDaemon.inc      | 26 ++++++++++------
 .../mail-methods/class_mail-methods-cyrus.inc |  3 +-
 .../class_debconfProfileGeneric.inc           | 17 +++++-----
 dns/admin/dns/class_DnsRecordAttribute.inc    |  3 +-
 ejbca/admin/ejbca/class_ejbcaCertSelect.inc   |  3 +-
 fai/admin/fai/class_faiPackage.inc            | 15 ++++++---
 fai/admin/systems/class_faiLogView.inc        |  3 +-
 .../repository/class_serviceRepository.inc    |  6 ++--
 .../freeradius/class_freeradiusGroup.inc      | 29 +++++++++--------
 .../freeradius/class_freeradiusAccount.inc    | 31 +++++++++----------
 .../gpg/pgpKeySelect/class_pgpKeySelect.inc   | 12 ++++---
 .../services/kolab2/class_serviceKolab.inc    | 12 ++++---
 .../addons/ldapmanager/class_ldapmanager.inc  |  5 +--
 16 files changed, 101 insertions(+), 78 deletions(-)

diff --git a/alias/admin/alias/class_mailAliasDistribution.inc b/alias/admin/alias/class_mailAliasDistribution.inc
index 676583c7ab..a44dd5f2cf 100644
--- a/alias/admin/alias/class_mailAliasDistribution.inc
+++ b/alias/admin/alias/class_mailAliasDistribution.inc
@@ -43,12 +43,10 @@ class mailAliasDistribution extends simplePlugin
     );
   }
 
-  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     global $config;
     return array(
-      // Attributes are grouped by section
       'main' => array(
         'name'  => _('Mail distribution'),
         'attrs' => array(
@@ -76,7 +74,8 @@ class mailAliasDistribution extends simplePlugin
           new DateAttribute(
             _('Expiration date'), _('Date after which the alias should be deleted. Leave empty for no deletion.'),
             'aliasExpirationDate', FALSE,
-            'U', // Unix timestamp
+             // Unix timestamp
+            'U',
             ''
           )
         )
diff --git a/alias/admin/alias/class_mailAliasRedirection.inc b/alias/admin/alias/class_mailAliasRedirection.inc
index 9b97273d74..069489a029 100644
--- a/alias/admin/alias/class_mailAliasRedirection.inc
+++ b/alias/admin/alias/class_mailAliasRedirection.inc
@@ -43,11 +43,9 @@ class mailAliasRedirection extends simplePlugin
     );
   }
 
-  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     return array(
-      // Attributes are grouped by section
       'main' => array(
         'name'  => _('Mail redirection'),
         'attrs' => array(
@@ -72,7 +70,8 @@ class mailAliasRedirection extends simplePlugin
           new DateAttribute(
             _('Expiration date'), _('Date after which the redirection should be deleted. Leave empty for no deletion.'),
             'aliasExpirationDate', FALSE,
-            'U', // Unix timestamp
+            // Unix timestamp
+            'U',
             ''
           )
         )
diff --git a/argonaut/addons/argonaut/class_argonautQueue.inc b/argonaut/addons/argonaut/class_argonautQueue.inc
index 16dc77247e..a5a323a3d6 100644
--- a/argonaut/addons/argonaut/class_argonautQueue.inc
+++ b/argonaut/addons/argonaut/class_argonautQueue.inc
@@ -188,8 +188,8 @@ class argonautQueue extends simpleManagement
     if ($this->o_queue->is_error()) {
       msg_dialog::display(_('Info'), sprintf(_('%s'), $this->o_queue->get_error()), INFO_DIALOG);
     }
-
-    $this->o_queue->remove_entries($taskids); // Removing the task.
+    /* Removing the task. */
+    $this->o_queue->remove_entries($taskids);
   }
 
   function processNow($action = '', $target = array(), $all = array())
diff --git a/argonaut/include/class_supportDaemon.inc b/argonaut/include/class_supportDaemon.inc
index 51e59c90c6..99aa3eb47b 100644
--- a/argonaut/include/class_supportDaemon.inc
+++ b/argonaut/include/class_supportDaemon.inc
@@ -225,7 +225,8 @@ class supportDaemon
       return $status[0];
     } catch (jsonRPCClient_RequestErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
-      $this->new_state(TRUE); // connection is OK
+      /* connection is OK */
+      $this->new_state(TRUE);
       return FALSE;
     } catch (jsonRPCClient_NetworkErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
@@ -331,7 +332,7 @@ class supportDaemon
    *
    * \return array All queued entries as an array or FALSE if there is an error.
    */
-  public function get_queued_entries() //$event_types = array("*"),$from=-1,$to=-1,$sort="timestamp DESC"
+  public function get_queued_entries()
   {
     if ($this->s_host == "") {
       $this->set_error($this->host_error);
@@ -394,7 +395,8 @@ class supportDaemon
       return $this->new_state(TRUE);
     } catch (jsonRPCClient_RequestErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
-      $this->new_state(TRUE); // connection is OK
+      /* connection is OK */
+      $this->new_state(TRUE);
       return FALSE;
     } catch (jsonRPCClient_NetworkErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
@@ -454,7 +456,8 @@ class supportDaemon
       return $this->new_state(TRUE);
     } catch (jsonRPCClient_RequestErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
-      $this->new_state(TRUE); // connection is OK
+      /* connection is OK */
+      $this->new_state(TRUE);
       return FALSE;
     } catch (jsonRPCClient_NetworkErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
@@ -528,7 +531,8 @@ class supportDaemon
       return $entries;
     } catch (jsonRPCClient_RequestErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
-      $this->new_state(TRUE); // connection is OK
+      /* connection is OK */
+      $this->new_state(TRUE);
       return FALSE;
     } catch (jsonRPCClient_NetworkErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
@@ -629,7 +633,8 @@ class supportDaemon
       return $client->ping($mac);
     } catch (jsonRPCClient_RequestErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
-      $this->new_state(TRUE); // connection is OK
+      /* connection is OK */
+      $this->new_state(TRUE); 
       return FALSE;
     } catch (jsonRPCClient_NetworkErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
@@ -664,7 +669,8 @@ class supportDaemon
     if ($this->saved_state() == FALSE) {
       return array();
     }
-    if ($package_list) { // filters is a package name list
+    /* filters is a package name list */
+    if ($package_list) {
       foreach ($filters as &$filter) {
         $filter = "^".$this->escape_perl_chars($filter)."$";
       }
@@ -699,7 +705,8 @@ class supportDaemon
       return $to_return;
     } catch (jsonRPCClient_RequestErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
-      $this->new_state(TRUE); // connection is OK
+      /* connection is OK */
+      $this->new_state(TRUE);
       return array();
     } catch (jsonRPCClient_NetworkErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
@@ -763,7 +770,8 @@ class supportDaemon
       return $this->new_state(TRUE);
     } catch (jsonRPCClient_RequestErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
-      $this->new_state(TRUE); // connection is OK
+      /* connection is OK */
+      $this->new_state(TRUE);
       return FALSE;
     } catch (jsonRPCClient_NetworkErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
diff --git a/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc b/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
index 15a3e5b099..44338b18f1 100644
--- a/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
+++ b/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
@@ -425,7 +425,8 @@ class mailMethodCyrus extends mailMethod
     $acls = imap_getacl ($this->imap_handle, $this->account_id);
     foreach ($acls as $user => $acl) {
       if ($user == "anyone") {
-        $user = "__anyone__"; // Map to internal placeholder
+      /* Map to internal placeholder */
+        $user = "__anyone__";
       }
       $folder_acls[$user] = $acl;
     }
diff --git a/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc b/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc
index d147acd34e..7cdaba2087 100644
--- a/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc
+++ b/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc
@@ -53,8 +53,6 @@ class DebconfEntriesAttribute extends CompositeAttribute
         $this->attributes[$cn] = new StringAttribute ($cn, $desc, "debconfentry_$cn", FALSE, $default);
         $this->attributes[$cn]->setInLdap(FALSE);
         $this->attributes[$cn]->setAcl($this->getAcl());
-        //~ 'choices'
-        //~ 'extendedDescription'
       }
     }
     $ldap->cd("ou=questions,".$this->plugin->dn);
@@ -64,10 +62,8 @@ class DebconfEntriesAttribute extends CompositeAttribute
         $cn = $entry['cn'][0];
         if (isset($this->attributes[$cn])) {
           $this->attributes[$cn]->setValue($entry['value'][0]);
-          $this->attributes[$cn]->loadValue(NULL); // set initialValue
-          //~ 'flags'
-          //~ 'owners'
-          //~ 'template'
+          /* set initialValue */
+          $this->attributes[$cn]->loadValue(NULL);
         } else {
           msg_dialog::display(_("Error"),  _("There is no template for this profile"), ERROR_DIALOG);
         }
@@ -115,11 +111,14 @@ class DebconfImportAttribute extends FileAttribute
     $matches = array();
     $str = fread($handle, 1024);
     strpos($str, "dn:");
-    $tmp = str_replace ("\n", "", $str);  // removing breaklines
-    $tmp = str_replace (" ", "", $tmp);   // removing spaces
+    /* removing breaklines */
+    $tmp = str_replace ("\n", "", $str);
+    /* removing spaces */
+    $tmp = str_replace (" ", "", $tmp);
+    /* searching for dn: containing the template name */
     if (preg_match( "/dn:.*,ou=templates,ou=([^,=]+),".get_ou("debconfRDN").
                     $config->current['BASE']."/",
-                    $tmp, $matches) > 0) {    // searching for dn: containing the template name
+                    $tmp, $matches) > 0) {
       $this->plugin->attributesAccess['ou']->setPostValue($matches[1]);
       $this->plugin->attributesAccess['ou']->setValue($matches[1]);
       $this->plugin->attributesAccess['ou']->setDisabled(TRUE);
diff --git a/dns/admin/dns/class_DnsRecordAttribute.inc b/dns/admin/dns/class_DnsRecordAttribute.inc
index 04f6a3045e..d111e9c17b 100644
--- a/dns/admin/dns/class_DnsRecordAttribute.inc
+++ b/dns/admin/dns/class_DnsRecordAttribute.inc
@@ -372,7 +372,8 @@ class DnsRecordAttribute extends CompositeAttribute
         $this->attributes[2]->setVisible(FALSE);
       }
     }
-    $this->setAttributes($this->attributes); // Update ACLs
+    /* Update ACLs */
+    $this->setAttributes($this->attributes);
   }
 
   function applyPostValue()
diff --git a/ejbca/admin/ejbca/class_ejbcaCertSelect.inc b/ejbca/admin/ejbca/class_ejbcaCertSelect.inc
index 3f4fd8ccba..5a8543419a 100644
--- a/ejbca/admin/ejbca/class_ejbcaCertSelect.inc
+++ b/ejbca/admin/ejbca/class_ejbcaCertSelect.inc
@@ -89,7 +89,8 @@ class EjbcaUserCertsAttribute extends GenericDialogAttribute
   {
     $id   = $this->getHtmlId();
     $div  = new divSelectBox($id);
-    $displays = $this->getDisplayValues(); // Updates and get display values
+    /* Updates and get display values */
+    $displays = $this->getDisplayValues();
     foreach ($displays as $key => $display_item) {
       $fields = array(
         array('string'  => $display_item['cn'][0])
diff --git a/fai/admin/fai/class_faiPackage.inc b/fai/admin/fai/class_faiPackage.inc
index 7d38ca4671..a6f0d42dac 100644
--- a/fai/admin/fai/class_faiPackage.inc
+++ b/fai/admin/fai/class_faiPackage.inc
@@ -268,20 +268,24 @@ class PackagesAttribute extends DialogOrderedArrayAttribute
       return;
     }
 
+    /* If there are no packages, no need to do anything */
     if (empty($this->value)) {
-      return; // If there are no packages, no need to do anything
+      return;
     }
 
     $attrs = array('distribution','package','version','section','description','timestamp','hastemplate');
 
-    $packages = array_diff_key($this->value, $this->buffer); // packages names that are not already in the buffer
+    /* packages names that are not already in the buffer */
+    $packages = array_diff_key($this->value, $this->buffer);
 
     $release  = $this->plugin->FAIdebianRelease;
     $q        = new supportDaemon();
     $customs  = serviceRepository::getCustomReleases($release);
     for ($i = -1; (count($packages) > 0) && ($i < count($customs)); $i++) {
-      if ($i >= 0) { // if release has been handled
-        $release = $customs[$i]; // take the next custom
+      /* if release has been handled */
+      if ($i >= 0) {
+        /* take the next custom */
+        $release = $customs[$i];
       }
       $ret = $q->FAI_get_packages($release, $attrs, array_keys($packages), -1, -1, TRUE);
       if ($q->is_error()) {
@@ -293,7 +297,8 @@ class PackagesAttribute extends DialogOrderedArrayAttribute
             $attr['DESCRIPTION'] = '';
           }
           $this->buffer[$attr['PACKAGE']] = $attr;
-          unset($packages[$attr['PACKAGE']]); // remove found packages
+           /* remove found packages */
+          unset($packages[$attr['PACKAGE']]);
           if ($i >= 0) {
             $this->FAIcustomRelease[$release] = $release;
           }
diff --git a/fai/admin/systems/class_faiLogView.inc b/fai/admin/systems/class_faiLogView.inc
index 2716d3e51e..8c16524906 100644
--- a/fai/admin/systems/class_faiLogView.inc
+++ b/fai/admin/systems/class_faiLogView.inc
@@ -29,7 +29,8 @@ class AvailableLogsAttribute extends Attribute
       'file'      => '',
       'time'      => '',
       'sort_by'   => 'time',
-      'sort_up'  => TRUE // TRUE means up
+      /* TRUE means up */
+      'sort_up'  => TRUE
     );
     parent::__construct ('', $description, $ldapName, FALSE, $value, $acl);
     $this->setInLdap(FALSE);
diff --git a/fai/admin/systems/services/repository/class_serviceRepository.inc b/fai/admin/systems/services/repository/class_serviceRepository.inc
index 5ec301781f..044f303529 100644
--- a/fai/admin/systems/services/repository/class_serviceRepository.inc
+++ b/fai/admin/systems/services/repository/class_serviceRepository.inc
@@ -178,9 +178,11 @@ class serviceRepository extends simpleService
               _('Repositories this server hosts'),
               'FAIrepository'
             ),
-            FALSE,  // no order
+            /* no order */
+            FALSE,
             array(),
-            TRUE    // edit button
+            /* edit button */ 
+            TRUE
           )
         )
       )
diff --git a/freeradius/admin/freeradius/class_freeradiusGroup.inc b/freeradius/admin/freeradius/class_freeradiusGroup.inc
index d23911cba5..951f09a90c 100644
--- a/freeradius/admin/freeradius/class_freeradiusGroup.inc
+++ b/freeradius/admin/freeradius/class_freeradiusGroup.inc
@@ -44,29 +44,28 @@ class freeradiusGroup extends simplePlugin {
   static function getAttributesInfo ()
   {
     return array(
-    // Attributes are grouped by section
     'section1' => array(
         'name'  => _('Support 802.1x'),
         'attrs' => array(
           new StringAttribute(
-            _('Tunnel medium type'),              // Label of the attribute
-            _('Name of the tunnel medium type'),  // Description
-            'radiusTunnelMediumType',             // LDAP name
-            TRUE,                                 // Mandatory
-            'IEEE-802'                            // default value
+            _('Tunnel medium type'),
+            _('Name of the tunnel medium type'),
+            'radiusTunnelMediumType',
+            TRUE,
+            'IEEE-802'
           ),
             new StringAttribute(
-            _('Tunnel type'),               // Label of the attribute
-            _('Name of the tunnel type'),   // Description
-            'radiusTunnelType',             // LDAP name
-            TRUE,                           // Mandatory
-            'VLAN'                          // default value
+            _('Tunnel type'),
+            _('Name of the tunnel type'),
+            'radiusTunnelType',
+            TRUE,
+            'VLAN'
           ),
           new StringAttribute(
-            _('VLAN id'),                   // Label of the attribute
-            _('VLAN identifier'),           // Description
-            'radiusTunnelPrivateGroupId',   // LDAP name
-            FALSE,                           // Mandatory
+            _('VLAN id'),
+            _('VLAN identifier'),
+            'radiusTunnelPrivateGroupId',
+            FALSE,
             ''
           )
         )
diff --git a/freeradius/personal/freeradius/class_freeradiusAccount.inc b/freeradius/personal/freeradius/class_freeradiusAccount.inc
index a0e64c55ca..7d3251f027 100644
--- a/freeradius/personal/freeradius/class_freeradiusAccount.inc
+++ b/freeradius/personal/freeradius/class_freeradiusAccount.inc
@@ -23,7 +23,7 @@
 
 class freeradiusAccount extends simplePlugin {
 
-  var $displayHeader = TRUE; // If we want the button Add/Delete
+  var $displayHeader = TRUE;
   var $objectclasses = array('radiusprofile');
 
   /*!
@@ -36,7 +36,7 @@ class freeradiusAccount extends simplePlugin {
       'plDescription' => _('This Plugin is for Radius accounting based in FreeRadius'),
       'plIcon'        => 'geticon.php?context=applications&icon=freeradius&size=48',
       'plSmallIcon'   => 'geticon.php?context=applications&icon=freeradius&size=16',
-      'plSelfModify'  => TRUE,                  // Does this plugin have an owner that might be able to edit its entry
+      'plSelfModify'  => TRUE,
       'plPriority'    => 11,
       'plObjectType'  => array('user'),
 
@@ -50,7 +50,6 @@ class freeradiusAccount extends simplePlugin {
   static function getAttributesInfo ()
   {
     return array(
-    // Attributes are grouped by section
     'section1' => array(
         'name'  => _('Support 802.1x'),
         'attrs' => array(
@@ -79,13 +78,13 @@ class freeradiusAccount extends simplePlugin {
       'section2' => array(
         'name'  => _('Groups'),
         'attrs' => array(
-          new SetAttribute(               // This attribute is multi-valuated
+          new SetAttribute(
               new SelectAttribute (
-              _('Groups'),                // Label of the attribute
-              _('FreeRadius Group'),      // Description
-              'radiusGroupName',          // LDAP name
-              FALSE,                      // Mandatory
-              array("")                   // [SelectAttribute] Choices
+              _('Groups'),
+              _('FreeRadius Group'),
+              'radiusGroupName',
+              FALSE,
+              array("") 
             )
           ),
         ),
@@ -111,9 +110,9 @@ class freeradiusAccount extends simplePlugin {
             new IntAttribute(
               _('Framed-MTU'), _('Framed-MTU'),
               'radiusFramedMTU', FALSE,
-              0,                                // [FloatAttribute] Minimum value
-              FALSE,                            // [FloatAttribute] No maximum value
-              1500                              // [FloatAttribute] Default value
+              0,
+              FALSE,
+              1500
             ),
             new StringAttribute(
               _('Compression'), _('Compression'),
@@ -127,10 +126,10 @@ class freeradiusAccount extends simplePlugin {
             ),
             new IntAttribute(
               _('Session Timeout'), _('Session Timeout'),
-              'radiusSessionTimeout', FALSE,                    // Mandatory
-              FALSE,                    // no minimum value
-              FALSE,                    // no maximum value
-              ""                        // no default value
+              'radiusSessionTimeout', FALSE,
+              FALSE,
+              FALSE,
+              ""
             ),
             new IntAttribute(
               _('Idle Timeout'), _('Idle Timeout'),
diff --git a/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc b/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc
index f1d88c1b81..998b37b204 100644
--- a/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc
+++ b/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc
@@ -109,12 +109,14 @@ class pgpKeySelect extends simpleSelectManagement
 
   static function pgpSize($size)
   {
-    return strval(intval($size)); // Remove useless 0 at the beginning
+    /* Remove useless 0 at the beginning */
+    return strval(intval($size));
   }
 
   static function pgpRevoked($value)
   {
-    return ($value == 0?'No':'Yes'); // Remove useless 0 at the beginning
+    /* Remove useless 0 at the beginning */
+    return ($value == 0?'No':'Yes');
   }
 }
 
@@ -193,14 +195,16 @@ class PgpKeyAttribute extends GenericDialogAttribute
     $headers    = array_values($this->displayed_values);
     $headers[]  = '';
     $div->SetHeaders($headers);
-    $displays = $this->getDisplayValues(); // Updates and get display values
+    /* Updates and get display values */
+    $displays = $this->getDisplayValues();
     foreach ($displays as $key => $display_item) {
       $fields = array();
       foreach (array_keys($this->displayed_values) as $field) {
         if (isset($display_item[$field][0]) && !empty($display_item[$field][0])) {
           $display = $display_item[$field][0];
           if ($field == 'pgpKeySize') {
-            $display = pgpKeySelect::pgpSize($display); // Remove useless 0 in front of the number
+            /* Remove useless 0 in front of the number */
+            $display = pgpKeySelect::pgpSize($display);
           } elseif ($field == 'pgpKeyCreateTime') {
             $display = pgpKeySelect::pgpDate($display);
           } elseif ($field == 'pgpKeyExpireTime') {
diff --git a/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc b/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc
index 8ca34f3304..38dadd4dc4 100644
--- a/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc
+++ b/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc
@@ -144,8 +144,10 @@ class serviceKolab extends simpleService
             _('Quota occupation limit before warning users (%)'),
             _('Warn users when using more than X% of their mail quota'),
             'cyrus-quotawarn', FALSE,
-            FALSE, FALSE, // min and max
-            80 // default value
+            /* min and max */
+            FALSE, FALSE,
+            /* default value */
+            80
           )
         )
       ),
@@ -161,8 +163,10 @@ class serviceKolab extends simpleService
             _('Number of days to include when creating free/busy lists'),
             _('Include data from X days in the past when creating free/busy lists'),
             'kolabFreeBusyFuture', FALSE,
-            FALSE, FALSE, // min and max
-            1 // default value
+            /* min and max */
+            FALSE, FALSE,
+            /* default value */
+            1
           )
         )
       ),
diff --git a/ldapmanager/addons/ldapmanager/class_ldapmanager.inc b/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
index 359ccacc46..1311b6f374 100644
--- a/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
+++ b/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
@@ -168,8 +168,9 @@ class ldapmanager extends simplePlugin
   function save_export($dn, $acl, $scope, $name)
   {
     global $config;
-    if (!empty($dn)) { // An LDIF export was asked
-      // Check permissions
+    if (!empty($dn)) {
+      /* An LDIF export was asked */
+      /* Check permissions */
       if (!$this->acl_is_writeable($acl, $this->acl_skip_write())) {
         msg_dialog::display(_('Permission error'),
             sprintf(_('You have no permission to export %s!'), bold(LDAP::fix($dn))),
-- 
GitLab


From 09523944182438fa11d1dd7cb3a95f3540347369 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Tue, 8 Nov 2016 23:41:31 +0100
Subject: [PATCH 42/54] Cleaning minor sonar code compliance Move this trailing
 comment on the previous empty line Add one whitespace between the colon and
 the value. Move the opening curly brace to the previous line.

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 alias/admin/alias/class_aliasManagement.inc   |  6 +-
 alias/admin/alias/main.inc                    |  6 +-
 argonaut/addons/argonaut/deploy-list.xml      | 16 +--
 argonaut/include/class_supportDaemon.inc      |  5 +-
 .../mail-methods/class_mail-methods-cyrus.inc |  8 +-
 dsa/admin/dsa/class_dsaManagement.inc         |  6 +-
 dsa/admin/dsa/main.inc                        |  6 +-
 ejbca/admin/ejbca/class_ejbcaManagement.inc   |  6 +-
 ejbca/admin/ejbca/main.inc                    |  6 +-
 .../repository/class_serviceRepository.inc    |  2 -
 .../freeradius/class_freeradiusGroup.inc      |  6 +-
 .../freeradius/class_freeradiusAccount.inc    |  2 +-
 fusioninventory/html/collect.php              | 10 +-
 fusioninventory/html/plugins/inventory.css    | 49 +++++-----
 kolab2/personal/kolab2/main.inc               |  6 +-
 mail/personal/mail/class_mail-methods.inc     |  2 +-
 .../netgroups/class_filterNetGroupLDAP.inc    |  8 +-
 .../netgroups/class_netgroupManagement.inc    | 10 +-
 netgroups/admin/netgroups/main.inc            |  8 +-
 .../class_memberNisnetgroupSelect.inc         |  8 +-
 .../netgroups/class_netgroupSystem.inc        |  6 +-
 .../opsi/class_opsiProductProperties.inc      |  4 +-
 .../opsi/class_opsiProfileManagement.inc      |  2 +-
 .../dashboard/class_dashBoardPPolicy.inc      |  9 +-
 .../admin/ppolicy/class_ppolicyManagement.inc |  6 +-
 ppolicy/admin/ppolicy/main.inc                |  6 +-
 .../admin/systems/puppet/class_puppetNode.inc | 18 ++--
 .../services/quota/class_serviceQuota.inc     | 11 ++-
 quota/personal/quota/main.inc                 | 28 +++---
 .../repository/class_repositoryManagement.inc |  8 +-
 repository/admin/repository/main.inc          |  6 +-
 .../samba/class_sambaDomainManagement.inc     |  8 +-
 samba/admin/samba/main.inc                    |  6 +-
 sogo/admin/sogo/class_sogoManagement.inc      |  8 +-
 sogo/admin/sogo/main.inc                      |  6 +-
 squid/personal/squid/class_proxyAccount.inc   | 26 ++---
 ssh/personal/ssh/class_sshAccount.inc         |  5 +-
 .../subcontracting/class_subContracting.inc   | 56 +++++------
 sudo/admin/sudo/class_sudoOption.inc          |  5 +-
 .../personal/supann/class_supannAccount.inc   | 35 ++++---
 supann/personal/supann/main.inc               |  6 +-
 .../dashboard/class_dashBoardSystems.inc      |  5 +-
 .../admin/ogroups/goto/class_termgroup.inc    |  6 +-
 .../admin/systems/class_networkSettings.inc   | 29 +++---
 systems/admin/systems/serverService-list.xml  | 12 +--
 .../services/shares/class_serviceShare.inc    |  5 +-
 systems/admin/systems/system-list.xml         | 38 +++----
 .../html/class_expiredUserPostpone.inc        |  2 +-
 .../include/jsonrpcphp/jsonRPCServer.php      | 98 +++++++++----------
 49 files changed, 307 insertions(+), 329 deletions(-)

diff --git a/alias/admin/alias/class_aliasManagement.inc b/alias/admin/alias/class_aliasManagement.inc
index f07eabdeb3..8199ad1c72 100644
--- a/alias/admin/alias/class_aliasManagement.inc
+++ b/alias/admin/alias/class_aliasManagement.inc
@@ -3,17 +3,17 @@
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2010 Antoine Gallavardin
   Copyright (C) 2012-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/alias/admin/alias/main.inc b/alias/admin/alias/main.inc
index 075dd7e551..f3eaa4629b 100644
--- a/alias/admin/alias/main.inc
+++ b/alias/admin/alias/main.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2013-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/argonaut/addons/argonaut/deploy-list.xml b/argonaut/addons/argonaut/deploy-list.xml
index a57c8ab3e6..240a055c69 100644
--- a/argonaut/addons/argonaut/deploy-list.xml
+++ b/argonaut/addons/argonaut/deploy-list.xml
@@ -73,17 +73,17 @@
   <actionmenu>
 
     <action>
-     <name>import</name>
-     <type>entry</type>
-     <image>geticon.php?context=actions&amp;icon=document-import&amp;size=16</image>
-     <label>Import</label>
+      <name>import</name>
+      <type>entry</type>
+      <image>geticon.php?context=actions&amp;icon=document-import&amp;size=16</image>
+      <label>Import</label>
     </action>
 
     <action>
-     <name>remove</name>
-     <type>entry</type>
-     <image>geticon.php?context=actions&amp;icon=edit-delete&amp;size=16</image>
-     <label>Remove</label>
+      <name>remove</name>
+      <type>entry</type>
+      <image>geticon.php?context=actions&amp;icon=edit-delete&amp;size=16</image>
+      <label>Remove</label>
     </action>
 
     <action>
diff --git a/argonaut/include/class_supportDaemon.inc b/argonaut/include/class_supportDaemon.inc
index 99aa3eb47b..bd10337717 100644
--- a/argonaut/include/class_supportDaemon.inc
+++ b/argonaut/include/class_supportDaemon.inc
@@ -634,7 +634,7 @@ class supportDaemon
     } catch (jsonRPCClient_RequestErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
       /* connection is OK */
-      $this->new_state(TRUE); 
+      $this->new_state(TRUE);
       return FALSE;
     } catch (jsonRPCClient_NetworkErrorException $e) {
       $this->set_error(nl2br($e->getMessage()));
@@ -694,7 +694,8 @@ class supportDaemon
         }
         if (in_array("SECTION", $attrs)) {
           foreach ($packages as &$package) {
-            $package['SECTION'] = $section; // FIXME : do we want to do this? It will replace "contrib/misc by contrib, for instance
+            /* FIXME : do we want to do this? It will replace "contrib/misc by contrib, for instance */
+            $package['SECTION'] = $section;
           }
           unset($package);
         }
diff --git a/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc b/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
index 44338b18f1..72ff08c584 100644
--- a/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
+++ b/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
@@ -495,15 +495,13 @@ class mailMethodCyrus extends mailMethod
   {
     mailMethod::saveSieveSettings();
 
-    /* Map attribute from parent class
-     */
+    /* Map attribute from parent class */
     $mail                     = $this->parent->mail;
     $gosaMailDeliveryMode     = $this->parent->gosaMailDeliveryMode;
     $gosaMailAlternateAddress = $this->parent->gosaMailAlternateAddress;
     $gosaVacationMessage      = $this->parent->gosaVacationMessage;
 
-    /* Try to login into sieve
-     */
+    /* Try to login into sieve */
     $cfg    = $this->ServerList[$this->parent->gosaMailServer];
     $sieve  = new sieve($cfg["sieve_server"], $cfg["sieve_port"], $this->getUAttribValue(),
                         $cfg["password"], $cfg["admin"], $cfg["sieve_option"]);
@@ -563,7 +561,7 @@ class mailMethodCyrus extends mailMethod
     if (is_integer(strpos($gosaMailDeliveryMode, "C")) ||
         is_integer(strpos($gosaMailDeliveryMode, "I")) ||
         is_integer(strpos($gosaMailDeliveryMode, "V"))) {
-          
+
       /* Add vacation information */
       $smarty->assign('vacation', is_integer(strpos($gosaMailDeliveryMode, "V")));
       if (is_integer(strpos($gosaMailDeliveryMode, "V"))) {
diff --git a/dsa/admin/dsa/class_dsaManagement.inc b/dsa/admin/dsa/class_dsaManagement.inc
index e1f9aeef23..2fc847d548 100644
--- a/dsa/admin/dsa/class_dsaManagement.inc
+++ b/dsa/admin/dsa/class_dsaManagement.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2013-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/dsa/admin/dsa/main.inc b/dsa/admin/dsa/main.inc
index 700027c00a..f6b44df061 100644
--- a/dsa/admin/dsa/main.inc
+++ b/dsa/admin/dsa/main.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2013-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/ejbca/admin/ejbca/class_ejbcaManagement.inc b/ejbca/admin/ejbca/class_ejbcaManagement.inc
index 2a4db6e118..12b486d18a 100644
--- a/ejbca/admin/ejbca/class_ejbcaManagement.inc
+++ b/ejbca/admin/ejbca/class_ejbcaManagement.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2014-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/ejbca/admin/ejbca/main.inc b/ejbca/admin/ejbca/main.inc
index d513c85848..fb73a458eb 100644
--- a/ejbca/admin/ejbca/main.inc
+++ b/ejbca/admin/ejbca/main.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2014-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
diff --git a/fai/admin/systems/services/repository/class_serviceRepository.inc b/fai/admin/systems/services/repository/class_serviceRepository.inc
index 044f303529..19729ce8ec 100644
--- a/fai/admin/systems/services/repository/class_serviceRepository.inc
+++ b/fai/admin/systems/services/repository/class_serviceRepository.inc
@@ -178,10 +178,8 @@ class serviceRepository extends simpleService
               _('Repositories this server hosts'),
               'FAIrepository'
             ),
-            /* no order */
             FALSE,
             array(),
-            /* edit button */ 
             TRUE
           )
         )
diff --git a/freeradius/admin/freeradius/class_freeradiusGroup.inc b/freeradius/admin/freeradius/class_freeradiusGroup.inc
index 951f09a90c..69bf15c27f 100644
--- a/freeradius/admin/freeradius/class_freeradiusGroup.inc
+++ b/freeradius/admin/freeradius/class_freeradiusGroup.inc
@@ -4,17 +4,17 @@
   Copyright (C) 2003-2009 GONICUS GmbH
   Copyright (C) 2012 WILLIAME Jeremy
   Copyright (C) 2011-2016  FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/freeradius/personal/freeradius/class_freeradiusAccount.inc b/freeradius/personal/freeradius/class_freeradiusAccount.inc
index 7d3251f027..20f081a4ec 100644
--- a/freeradius/personal/freeradius/class_freeradiusAccount.inc
+++ b/freeradius/personal/freeradius/class_freeradiusAccount.inc
@@ -84,7 +84,7 @@ class freeradiusAccount extends simplePlugin {
               _('FreeRadius Group'),
               'radiusGroupName',
               FALSE,
-              array("") 
+              array("")
             )
           ),
         ),
diff --git a/fusioninventory/html/collect.php b/fusioninventory/html/collect.php
index aad2e55685..b98e6facfb 100644
--- a/fusioninventory/html/collect.php
+++ b/fusioninventory/html/collect.php
@@ -1,12 +1,10 @@
 <?php
-# Collect inventory and store them in the LDAP
-# Usage :
-#  fusioninventory-agent --server http://server/fusiondirectory/collect.php
+/* Collect inventory and store them in the LDAP
+   Usage : fusioninventory-agent --server http://server/fusiondirectory/collect.php */
 require_once('../include/php_setup.inc');
 require_once('functions.inc');
 require_once('variables.inc');
 
-##########################################################################
 $http_raw_post_data = file_get_contents('php://input');
 
 if (!$http_raw_post_data) {
@@ -19,14 +17,14 @@ if (strpos($http_raw_post_data, "<?xml") === 0) {
 } elseif ($xml = @gzuncompress($http_raw_post_data)) {
     $compressmode = "gzcompress";
 } elseif ($xml = @gzinflate ("\x1f\x8b\x08\x00\x00\x00\x00\x00".$http_raw_post_data)) {
-    // ** OCS agent 2.0 Compatibility, but return in gzcompress
+    /* OCS agent 2.0 Compatibility, but return in gzcompress */
     $compressmode = "gzdeflate";
     if (strstr($xml, "<QUERY>PROLOG</QUERY>")
             AND !strstr($xml, "<TOKEN>")) {
         $compressmode = "gzcompress";
     }
 } elseif ($xml = @gzinflate (substr($http_raw_post_data, 2))) {
-    // ** OCS agent 2.0 Compatibility, but return in gzcompress
+    /* OCS agent 2.0 Compatibility, but return in gzcompress */
     $compressmode = "gzdeflate";
     if (strstr($xml, "<QUERY>PROLOG</QUERY>")
             AND !strstr($xml, "<TOKEN>")) {
diff --git a/fusioninventory/html/plugins/inventory.css b/fusioninventory/html/plugins/inventory.css
index ae8a7685da..31300b5a2b 100644
--- a/fusioninventory/html/plugins/inventory.css
+++ b/fusioninventory/html/plugins/inventory.css
@@ -1,39 +1,34 @@
-ul.inventory
-{
-margin:0;
-padding:0;
+ul.inventory {
+margin: 0;
+padding: 0;
 }
 
-ul.inventory li
-{
-list-style-type:none;
+ul.inventory li {
+list-style-type: none;
 }
 
-html.ltr ul.inventory li div
-{
-margin-left:20px;
+html.ltr ul.inventory li div {
+margin-left: 20px;
 }
-html.rtl ul.inventory li div
-{
-margin-right:20px;
+
+html.rtl ul.inventory li div {
+margin-right: 20px;
 }
 
-html.ltr ul.inventory li table.list th
-{
-text-align:left;
-padding-right:10px;
+html.ltr ul.inventory li table.list th {
+text-align: left;
+padding-right: 10px;
 }
-html.rtl ul.inventory li table.list th
-{
-text-align:right;
-padding-left:10px;
+
+html.rtl ul.inventory li table.list th {
+text-align: right;
+padding-left: 10px;
 }
 
-ul.inventory li table.table
-{
-border-collapse:collapse;
+ul.inventory li table.table {
+border-collapse: collapse;
 }
-ul.inventory li table.table, ul.inventory li table.table td, ul.inventory li table.table th
-{
-border:1px solid black;
+
+ul.inventory li table.table, ul.inventory li table.table td, ul.inventory li table.table th {
+border: 1px solid black;
 }
diff --git a/kolab2/personal/kolab2/main.inc b/kolab2/personal/kolab2/main.inc
index 2d47f033bf..c39e13bba9 100644
--- a/kolab2/personal/kolab2/main.inc
+++ b/kolab2/personal/kolab2/main.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2011-2016  FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/mail/personal/mail/class_mail-methods.inc b/mail/personal/mail/class_mail-methods.inc
index eac8ccc78e..00833a69d0 100644
--- a/mail/personal/mail/class_mail-methods.inc
+++ b/mail/personal/mail/class_mail-methods.inc
@@ -32,7 +32,7 @@ class mailMethod
   protected $mailEqualsCN   = FALSE;
 
   /* the attribute used to create accounts */
-  protected $uattrib        = "mail";  // Naming attribute for accounts, e.g. imap.
+  protected $uattrib        = "mail";
 
   /* The account prefixes, keep the '.' here! See FAQ cyrusUseSlashes */
   protected $user_prefix    = "user.";
diff --git a/netgroups/admin/netgroups/class_filterNetGroupLDAP.inc b/netgroups/admin/netgroups/class_filterNetGroupLDAP.inc
index 6ef7d3a2b9..8f328e9549 100644
--- a/netgroups/admin/netgroups/class_filterNetGroupLDAP.inc
+++ b/netgroups/admin/netgroups/class_filterNetGroupLDAP.inc
@@ -2,20 +2,20 @@
 
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
-  
+
   Copyright (C) 2011 Alejandro Escanero Blanco (aescanero@gmail.com)
   Copyright (C) 2011-2016  FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/netgroups/admin/netgroups/class_netgroupManagement.inc b/netgroups/admin/netgroups/class_netgroupManagement.inc
index 6189894e2b..1ae99d83fd 100644
--- a/netgroups/admin/netgroups/class_netgroupManagement.inc
+++ b/netgroups/admin/netgroups/class_netgroupManagement.inc
@@ -1,19 +1,19 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
-  
+
   Copyright (C) 2013-2016  FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
@@ -21,7 +21,7 @@
 
 class netgroupManagement extends simpleManagement
 {
-  // Tab definition
+  /* Tab definition */
   protected $objectTypes  = array('netgroup');
 
   protected $departmentBrowser      = TRUE;
diff --git a/netgroups/admin/netgroups/main.inc b/netgroups/admin/netgroups/main.inc
index bda1cedd0b..dc8c3dfd85 100644
--- a/netgroups/admin/netgroups/main.inc
+++ b/netgroups/admin/netgroups/main.inc
@@ -1,19 +1,19 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
-  
+
   Copyright (C) 2013-2016  FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/netgroups/admin/netgroups/memberNisnetgroupSelect/class_memberNisnetgroupSelect.inc b/netgroups/admin/netgroups/memberNisnetgroupSelect/class_memberNisnetgroupSelect.inc
index 048883c2a4..f584d4db0f 100644
--- a/netgroups/admin/netgroups/memberNisnetgroupSelect/class_memberNisnetgroupSelect.inc
+++ b/netgroups/admin/netgroups/memberNisnetgroupSelect/class_memberNisnetgroupSelect.inc
@@ -1,19 +1,19 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
-  
+
   Copyright (C) 2013-2016  FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/netgroups/admin/systems/netgroups/class_netgroupSystem.inc b/netgroups/admin/systems/netgroups/class_netgroupSystem.inc
index 443bb2192f..2fd63158a5 100644
--- a/netgroups/admin/systems/netgroups/class_netgroupSystem.inc
+++ b/netgroups/admin/systems/netgroups/class_netgroupSystem.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2013-2016  FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/opsi/admin/opsi/class_opsiProductProperties.inc b/opsi/admin/opsi/class_opsiProductProperties.inc
index b1c5f4c216..2402f65f94 100644
--- a/opsi/admin/opsi/class_opsiProductProperties.inc
+++ b/opsi/admin/opsi/class_opsiProductProperties.inc
@@ -138,9 +138,9 @@ class opsiProductProperties extends simplePlugin
               ),
               '|', '', ''
             ),
-            FALSE,  // no order
+            FALSE,
             array(),
-            TRUE    // edit button
+            TRUE
           )
         )
       )
diff --git a/opsi/admin/opsi/class_opsiProfileManagement.inc b/opsi/admin/opsi/class_opsiProfileManagement.inc
index a66d137622..c703be03be 100644
--- a/opsi/admin/opsi/class_opsiProfileManagement.inc
+++ b/opsi/admin/opsi/class_opsiProfileManagement.inc
@@ -20,7 +20,7 @@
 
 class opsiManagement extends simpleManagement
 {
-  protected $objectTypes  = array('opsiProfile', 'opsiSoftwareList');//, 'opsiOnDemandList');
+  protected $objectTypes  = array('opsiProfile', 'opsiSoftwareList');
 
   protected $departmentBrowser      = FALSE;
   protected $departmentRootVisible  = FALSE;
diff --git a/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc b/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc
index b3c8ea722f..650fe2f947 100644
--- a/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc
+++ b/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc
@@ -3,17 +3,17 @@
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2014-2015  Dhatim
   Copyright (C) 2014-2016  FusionDirectory project
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -102,7 +102,8 @@ class dashboardPpolicy extends simplePlugin
     $locked_users           = array();
     $expired_accounts       = array();
     $next_expired_accounts  = array();
-    $maxAges = array(); // ppolicies cache
+    /*  ppolicies cache */
+    $maxAges = array();
     foreach ($users as $user) {
       if (isset($user['pwdAccountLockedTime'])) {
         $locked_user  = dashboardUsers::get_user_infos($user);
diff --git a/ppolicy/admin/ppolicy/class_ppolicyManagement.inc b/ppolicy/admin/ppolicy/class_ppolicyManagement.inc
index 1b4e4c45f1..76e36ff978 100644
--- a/ppolicy/admin/ppolicy/class_ppolicyManagement.inc
+++ b/ppolicy/admin/ppolicy/class_ppolicyManagement.inc
@@ -3,17 +3,17 @@
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2014-2015 Dhatim
   Copyright (C) 2014-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/ppolicy/admin/ppolicy/main.inc b/ppolicy/admin/ppolicy/main.inc
index 0a53450752..25c5f46ab6 100644
--- a/ppolicy/admin/ppolicy/main.inc
+++ b/ppolicy/admin/ppolicy/main.inc
@@ -3,17 +3,17 @@
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2014-2015 Dhatim
   Copyright (C) 2014-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
diff --git a/puppet/admin/systems/puppet/class_puppetNode.inc b/puppet/admin/systems/puppet/class_puppetNode.inc
index 40974860ad..bf8b9b98b7 100644
--- a/puppet/admin/systems/puppet/class_puppetNode.inc
+++ b/puppet/admin/systems/puppet/class_puppetNode.inc
@@ -24,11 +24,9 @@ class puppetNode extends simplePlugin
   var $displayHeader  = TRUE;
   var $objectclasses  = array("puppetClient");
 
-  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     return array(
-      // Attributes are grouped by section
       'section1' => array(
         'name'  => _("Puppet node settings"),
         'attrs' => array(
@@ -45,9 +43,12 @@ class puppetNode extends simplePlugin
                 new StringAttribute ('',   _('Name of the variable'),   'puppetVar'),
                 new StringAttribute ('=',  _('Value of the variable'),  'puppetVarValue'),
               ),
-              '%[^ =]=%[^ ]', // sscanf format
-              '%s=%s',        // sprintf format
-              '',             // acl, empty string means we don't care (handle it automagically)
+               /* sscanf format */
+              '%[^ =]=%[^ ]',
+              /* sprintf format  */
+              '%s=%s',
+              /* acl, empty string means we don't care (handle it automagically) */
+              '',
               'Puppet Vars'
             )
           ),
@@ -56,7 +57,6 @@ class puppetNode extends simplePlugin
     );
   }
 
-  // We also need this function that return some information about the plugin
   static function plInfo ()
   {
     return array(
@@ -64,8 +64,6 @@ class puppetNode extends simplePlugin
       "plDescription"     => _("Support for puppet schema in order to edit puppet classes and puppet vars"),
       "plSelfModify"      => FALSE,
       "plObjectType"      => array("server", "workstation"),
-
-      // But simplePlugin can generate the ACL list for us
       "plProvidedAcls"    => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );
   }
@@ -85,14 +83,14 @@ class puppetNode extends simplePlugin
     $this->attributesInfo['section1']['attrs']['parentNode']->setChoices($nodes);
     $ldap->search("(objectClass=puppetServer)", array('puppetAvailableEnvironment'));
     if ($ldap->count() == 0) {
-      $this->is_account = FALSE; // TODO : Add something to simplePlugin to handle this case : the tab should not exist
+      /* TODO : Add something to simplePlugin to handle this case : the tab should not exist */
+      $this->is_account = FALSE;
       return;
     }
     $attrs = $ldap->fetch();
     $envs = $attrs['puppetAvailableEnvironment'];
     unset($envs['count']);
     $this->attributesInfo['section1']['attrs']['environment']->setChoices($envs);
-    //~ $this->attributesInfo['section1']['attrs']['puppetClass']->attribute->setChoices(array('class1','class2'));
   }
 }
 
diff --git a/quota/admin/systems/services/quota/class_serviceQuota.inc b/quota/admin/systems/services/quota/class_serviceQuota.inc
index 6df7d1c621..d3c870725e 100644
--- a/quota/admin/systems/services/quota/class_serviceQuota.inc
+++ b/quota/admin/systems/services/quota/class_serviceQuota.inc
@@ -23,7 +23,6 @@ class serviceQuota extends simpleService
 {
   var $objectclasses = array('quotaService');
 
-  /* Return plugin informations for acl handling */
   static function plInfo()
   {
     return array(
@@ -54,7 +53,11 @@ class serviceQuota extends simpleService
                 new IntAttribute(
                   _('Quota block size'), _('Quota block size on this share (usually 1024)'),
                   'quotaBlockSize', TRUE,
-                  1 /*min*/, FALSE/*no max*/, 1024
+                  /*min*/
+                  1,
+                  /*no max*/
+                  FALSE,
+                  1024
                 ),
                 new StringAttribute(
                   _('Comment'), _('Short comment about this quota'),
@@ -63,9 +66,9 @@ class serviceQuota extends simpleService
               ),
               ':'
             ),
-            FALSE,  // no order
+            FALSE,
             array(),
-            TRUE    // edit button
+            TRUE
           )
         )
       ),
diff --git a/quota/personal/quota/main.inc b/quota/personal/quota/main.inc
index e2f8c08250..571ffab279 100644
--- a/quota/personal/quota/main.inc
+++ b/quota/personal/quota/main.inc
@@ -2,20 +2,20 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2013-2016  FusionDirectory
- 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 simplePlugin::mainInc('quotaAccount', $ui->dn);
diff --git a/repository/admin/repository/class_repositoryManagement.inc b/repository/admin/repository/class_repositoryManagement.inc
index bc5540b1e1..d8172bc860 100644
--- a/repository/admin/repository/class_repositoryManagement.inc
+++ b/repository/admin/repository/class_repositoryManagement.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2013-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -20,14 +20,12 @@
 
 class repositoryManagement extends simpleManagement
 {
-  // Tab definition
   protected $objectTypes  = array('buildRepository', 'repoDistribution', 'repoSection');
 
   protected $departmentBrowser      = TRUE;
   protected $departmentRootVisible  = TRUE;
   protected $baseMode               = TRUE;
 
-  /* Return plugin informations for acl handling  */
   public static function plInfo()
   {
     return array(
diff --git a/repository/admin/repository/main.inc b/repository/admin/repository/main.inc
index 1b845dc2cd..755f586282 100644
--- a/repository/admin/repository/main.inc
+++ b/repository/admin/repository/main.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2013-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/samba/admin/samba/class_sambaDomainManagement.inc b/samba/admin/samba/class_sambaDomainManagement.inc
index 34e6ef6bf3..47b8c84192 100644
--- a/samba/admin/samba/class_sambaDomainManagement.inc
+++ b/samba/admin/samba/class_sambaDomainManagement.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2013-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -20,7 +20,6 @@
 
 class sambaDomainManagement extends simpleManagement
 {
-  // Tab definition
   protected $objectTypes  = array('sambaDomain');
 
   protected $departmentBrowser      = FALSE;
@@ -28,7 +27,6 @@ class sambaDomainManagement extends simpleManagement
   protected $baseMode               = FALSE;
   protected $skipCpHandler          = TRUE;
 
-  /* Return plugin informations for acl handling  */
   public static function plInfo()
   {
     return array(
diff --git a/samba/admin/samba/main.inc b/samba/admin/samba/main.inc
index 61e78b290d..2e96190c75 100644
--- a/samba/admin/samba/main.inc
+++ b/samba/admin/samba/main.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2013-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/sogo/admin/sogo/class_sogoManagement.inc b/sogo/admin/sogo/class_sogoManagement.inc
index 542c7edcd2..1c34dd4e7d 100644
--- a/sogo/admin/sogo/class_sogoManagement.inc
+++ b/sogo/admin/sogo/class_sogoManagement.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2013-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -20,14 +20,12 @@
 
 class sogoManagement extends simpleManagement
 {
-  // Tab definition
   protected $objectTypes  = array('sogoResource');
 
   protected $departmentBrowser      = TRUE;
   protected $departmentRootVisible  = TRUE;
   protected $baseMode               = TRUE;
 
-  /* Return plugin informations for acl handling  */
   public static function plInfo()
   {
     return array(
diff --git a/sogo/admin/sogo/main.inc b/sogo/admin/sogo/main.inc
index 0ce97d8213..3dfe5aafda 100644
--- a/sogo/admin/sogo/main.inc
+++ b/sogo/admin/sogo/main.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2013-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/squid/personal/squid/class_proxyAccount.inc b/squid/personal/squid/class_proxyAccount.inc
index c1ebdd492e..e6f6b6b628 100644
--- a/squid/personal/squid/class_proxyAccount.inc
+++ b/squid/personal/squid/class_proxyAccount.inc
@@ -87,11 +87,11 @@ class proxyAccount extends simplePlugin
 
         'attrs' => array (
           new BooleanAttribute(
-            _('Filter unwanted content (i.e. pornographic or violence related)'),                       // Label of the attribute
-            _('filterF'),                     // Description
-            'gosaProxyAcctFlags',             // LDAP name
-            FALSE,                             // Mandatory
-            FALSE                             // default value
+            _('Filter unwanted content (i.e. pornographic or violence related)'),
+            _('filterF'),
+            'gosaProxyAcctFlags',
+            FALSE,
+            FALSE
           ),
           new workingTime (
             _('Working Start'),
@@ -100,9 +100,9 @@ class proxyAccount extends simplePlugin
               new SelectAttribute ( '',  _('HourStart'),   'hourstart',   TRUE, array(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24), 1, array('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24')),
               new SelectAttribute ( ':', _('MinuteStart'), 'minutestart', TRUE, array('00','15','30','45'))
             ),
-            '', // read format (not used)
-            '', // write format (not used)
-            '', // acl
+            '',
+            '',
+            '',
             _('Limit proxy access to working time')
           ),
           new workingTime (
@@ -124,7 +124,7 @@ class proxyAccount extends simplePlugin
             ),
             '/^(\\d+)(.)$/',
             '%d%s',
-            '', // acl
+            '',
             _('Restrict proxy usage by quota')
           ),
           new SelectAttribute (
@@ -139,16 +139,16 @@ class proxyAccount extends simplePlugin
             _('Starting hours for internet access'),
             'enableWorkingTime',
             FALSE,
-            FALSE,  // default value
-            'gosaProxyWorkingStart' // acl
+            FALSE,
+            'gosaProxyWorkingStart'
           ),
           new BooleanAttribute (
             _('Proxy Quota'),
             _('Max Data quota for the proxy'),
             'enableQuota',
             FALSE,
-            FALSE,  // default value
-            'gosaProxyQuota' // acl
+            FALSE,
+            'gosaProxyQuota'
           )
         )
       )
diff --git a/ssh/personal/ssh/class_sshAccount.inc b/ssh/personal/ssh/class_sshAccount.inc
index 8b13b37392..dc2dccbbde 100644
--- a/ssh/personal/ssh/class_sshAccount.inc
+++ b/ssh/personal/ssh/class_sshAccount.inc
@@ -73,7 +73,6 @@ class sshAccount extends simplePlugin
   var $displayHeader = TRUE;
   var $objectclasses = array('ldapPublicKey');
 
-  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     return array(
@@ -87,8 +86,8 @@ class sshAccount extends simplePlugin
               '', _('SSH public keys for this user'),
               'sshPublicKey'
             ),
-            FALSE, // no order
-            array(), TRUE // edit enabled
+            FALSE,
+            array(), TRUE
           )
         )
       )
diff --git a/subcontracting/personal/subcontracting/class_subContracting.inc b/subcontracting/personal/subcontracting/class_subContracting.inc
index 55c806c2f2..09fb943466 100644
--- a/subcontracting/personal/subcontracting/class_subContracting.inc
+++ b/subcontracting/personal/subcontracting/class_subContracting.inc
@@ -20,11 +20,7 @@
 
 class subContractingAccount extends simplePlugin
 {
-  // We set displayHeader to FALSE, because we don't want a header allowing to activate/deactivate this plugin,
-  // we want it activated on all objects
   var $displayHeader = TRUE;
-
-  // Here we indicate which LDAP classes our plugin is using.
   var $objectclasses = array('fdSubcontractingPerson');
 
   static function plInfo ()
@@ -36,12 +32,10 @@ class subContractingAccount extends simplePlugin
       'plIcon'        => 'geticon.php?context=applications&icon=subcontracting&size=48',
       'plSmallIcon'   => 'geticon.php?context=applications&icon=subcontracting&size=16',
 
-      // simplePlugin can generate the ACL list for us
       'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );
   }
 
-  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     return array(
@@ -49,39 +43,39 @@ class subContractingAccount extends simplePlugin
         'name'  => _('SubContracting Information'),
         'attrs' => array(
           new StringAttribute (
-            _('Intermediate'),                            // Label
-            _('Contact to the final customer'),           // Description
-            'fdMissionIntermediate',                      // LDAP name
-            FALSE,                                        // Not Mandatory
-            ''                                            // Default value
+            _('Intermediate'),
+            _('Contact to the final customer'),
+            'fdMissionIntermediate',
+            FALSE,
+            ''
           ),
           new StringAttribute (
-            _('Final Customer'),                          // Label
-            _('Final Customer for this mission'),         // Description
-            'fdMissionFinalCustomer',                     // LDAP name
-            FALSE,                                        // Not Mandatory
-            ''                                            // Default value
+            _('Final Customer'),
+            _('Final Customer for this mission'),
+            'fdMissionFinalCustomer',
+            FALSE,
+            ''
           ),
           new MailAttribute (
-            _('Mail Address'),                            // Label
-            _('Mail address assigned for this mission'),  // Description
-            'fdMissionMail',                              // LDAP name
-            FALSE,                                        // Not Mandatory
-            ''                                            // Default value
+            _('Mail Address'),
+            _('Mail address assigned for this mission'),
+            'fdMissionMail',
+            FALSE,
+            ''
           ),
           new StringAttribute (
-            _('Phone'),                                   // Label
-            _('Phone number assigned for this mission'),  // Description
-            'fdMissionPhone',                             // LDAP name
-            FALSE,                                        // Not Mandatory
-            ''                                            // Default value
+            _('Phone'),
+            _('Phone number assigned for this mission'),
+            'fdMissionPhone',
+            FALSE,
+            ''
           ),
           new StringAttribute (
-            _('Street Address'),                          // Label
-            _('Address where this mission is executed'),  // Description
-            'fdMissionAddress',                           // LDAP name
-            FALSE,                                        // Not Mandatory
-            ''                                            // Default value
+            _('Street Address'),
+            _('Address where this mission is executed'),
+            'fdMissionAddress',
+            FALSE,
+            ''
           ),
         )
       ),
diff --git a/sudo/admin/sudo/class_sudoOption.inc b/sudo/admin/sudo/class_sudoOption.inc
index 44fea8b2b3..516871ef4f 100644
--- a/sudo/admin/sudo/class_sudoOption.inc
+++ b/sudo/admin/sudo/class_sudoOption.inc
@@ -391,7 +391,8 @@ class SudoOptionAttribute extends Attribute
     $smarty->assign("booleanOptions", array("FALSE","TRUE"));
     if ($this->type == "STRING") {
       $display = '<input type="text" name="'.$id.'" id="'.$id.'" value="'.$value.'" />';
-    } elseif ($this->type == "LISTS") { //FIXME : LIST must be handle in an other way
+      /* FIXME : LIST must be handle in an other way */
+    } elseif ($this->type == "LISTS") {
       $display = '<input type="text" name="'.$id.'" id="'.$id.'" value="'.$value.'" />';
     } elseif ($this->type == "INTEGER") {
       $display = '<input type="number" name="'.$id.'" id="'.$id.'" value="'.$value.'" />';
@@ -472,11 +473,9 @@ class sudoOption extends simplePlugin
   var $displayHeader = FALSE;
   var $objectclasses = array();
 
-  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     return array(
-      // Attributes are grouped by section
       'available_options' => array(
         'name'  => _('Available options'),
         'attrs' => array(
diff --git a/supann/personal/supann/class_supannAccount.inc b/supann/personal/supann/class_supannAccount.inc
index 18d8c1ffb8..846757fc39 100644
--- a/supann/personal/supann/class_supannAccount.inc
+++ b/supann/personal/supann/class_supannAccount.inc
@@ -225,7 +225,6 @@ class supannAccount extends simplePlugin
     );
   }
 
-  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     $year = intval(date('Y'));
@@ -255,7 +254,8 @@ class supannAccount extends simplePlugin
               _('Ref ids'), _('supannRefId - IDs/links for this user on other systems'),
               'supannRefId', FALSE,
               '', '',
-              '/^{[^}]+}.+$/' /* Validation regexp: it must have a prefix */
+              /* Validation regexp: it must have a prefix */
+              '/^{[^}]+}.+$/'
             )
           ),
         )
@@ -404,9 +404,9 @@ class supannAccount extends simplePlugin
                 ),
               )
             ),
-            FALSE,  // no order
+            FALSE,
             array(),
-            FALSE   // no edit button
+            FALSE
           )
         )
       ),
@@ -454,11 +454,11 @@ class supannAccount extends simplePlugin
                 ),
               ),
               '',
-              '' // no label
+              ''
             ),
-            FALSE,  // no order
+            FALSE,
             array(),
-            FALSE   // no edit button
+            FALSE
           )
         )
       ),
@@ -511,13 +511,16 @@ class supannAccount extends simplePlugin
     $this->attributesAccess['supannEtuInscription']->setLinearRendering(FALSE);
 
     list ($codes, $labels) = supann::get_choices_for('eturegimeinscription_SISE', '{SISE}');
-    $this->attributesAccess['supannEtuInscription']->attribute->attributes[2]->setChoices($codes, $labels); // supannEtuRegimeInscription
+    /* supannEtuRegimeInscription */
+    $this->attributesAccess['supannEtuInscription']->attribute->attributes[2]->setChoices($codes, $labels);
 
     list ($codes, $labels) = supann::get_choices_for('discipline_SISE', '{SISE}');
-    $this->attributesAccess['supannEtuInscription']->attribute->attributes[3]->setChoices($codes, $labels); // supannEtuSecteurDisciplinaire
+    /* supannEtuSecteurDisciplinaire */
+    $this->attributesAccess['supannEtuInscription']->attribute->attributes[3]->setChoices($codes, $labels);
 
     list ($codes, $labels) = supann::get_choices_for('typediplome_SISE', '{SISE}');
-    $this->attributesAccess['supannEtuInscription']->attribute->attributes[4]->setChoices($codes, $labels); // supannEtuTypeDiplome
+    /* supannEtuTypeDiplome */
+    $this->attributesAccess['supannEtuInscription']->attribute->attributes[4]->setChoices($codes, $labels);
 
     list ($codes, $labels) = supann::get_choices_for('corps', '{NCORPS}');
     $this->attributesAccess['supannEmpCorps']->setChoices($codes, $labels);
@@ -535,12 +538,16 @@ class supannAccount extends simplePlugin
     );
     $code_etab   = $this->attributesAccess['supannEtablissement']->getValue();
     $label_etab  = $this->attributesAccess['supannEtablissement']->getDisplayValues();
-    $this->attributesAccess['supannEtuInscription']->attribute->attributes[0]->setChoices($code_etab, $label_etab); // supannEtablissement
-    $this->attributesAccess['supannEtuInscription']->attribute->attributes[6]->setChoices($code_ent, $label_ent); // supannEntiteAffectation
-    $this->attributesAccess['supannRoleEntite']->attribute->attributes[2]->setChoices($code_ent, $label_ent); // supannEntiteAffectation
+    /* supannEtablissement */
+    $this->attributesAccess['supannEtuInscription']->attribute->attributes[0]->setChoices($code_etab, $label_etab);
+    /* supannEntiteAffectation */
+    $this->attributesAccess['supannEtuInscription']->attribute->attributes[6]->setChoices($code_ent, $label_ent);
+    /* supannEntiteAffectation */
+    $this->attributesAccess['supannRoleEntite']->attribute->attributes[2]->setChoices($code_ent, $label_ent);
     $code_tent   = $this->attributesAccess['supannTypeEntiteAffectation']->getValue();
     $label_tent  = $this->attributesAccess['supannTypeEntiteAffectation']->getDisplayValues();
-    $this->attributesAccess['supannRoleEntite']->attribute->attributes[1]->setChoices($code_tent, $label_tent); // supannTypeEntiteAffectation
+    /* supannTypeEntiteAffectation */
+    $this->attributesAccess['supannRoleEntite']->attribute->attributes[1]->setChoices($code_tent, $label_tent);
 
     $this->attributesAccess['eduPersonPrimaryAffiliation']->setChoices(
       $this->attributesAccess['eduPersonAffiliation']->getValue(),
diff --git a/supann/personal/supann/main.inc b/supann/personal/supann/main.inc
index 38cceeac24..47415bc0ed 100644
--- a/supann/personal/supann/main.inc
+++ b/supann/personal/supann/main.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2012-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/systems/addons/dashboard/class_dashBoardSystems.inc b/systems/addons/dashboard/class_dashBoardSystems.inc
index d11b86d4c9..13e03a26f2 100644
--- a/systems/addons/dashboard/class_dashBoardSystems.inc
+++ b/systems/addons/dashboard/class_dashBoardSystems.inc
@@ -21,10 +21,8 @@
 
 class dashboardSystems extends simplePlugin
 {
-  /* default values */
   var $default_start_computer_id = 0;
 
-  /* Return plugin informations for acl handling  */
   static function plInfo()
   {
     return array(
@@ -155,7 +153,8 @@ class dashboardSystems extends simplePlugin
     }
 
     /* $get_cfg_value return the OU like ou=computer .. */
-    $winstation_ou  = mb_substr($config->get_cfg_value('sambaMachineAccountRDN'), 3); //FIXME use get_ou
+    /* FIXME use get_ou */
+    $winstation_ou  = mb_substr($config->get_cfg_value('sambaMachineAccountRDN'), 3);
     $nb_digits      = $config->get_cfg_value('dashboardNumberOfDigit', 3);
 
     /* running all the table */
diff --git a/systems/admin/ogroups/goto/class_termgroup.inc b/systems/admin/ogroups/goto/class_termgroup.inc
index d0e15e35fe..81602dbd2f 100644
--- a/systems/admin/ogroups/goto/class_termgroup.inc
+++ b/systems/admin/ogroups/goto/class_termgroup.inc
@@ -40,9 +40,9 @@ class termgroup extends plugin
                                 "update"          => "update",
                                 "reinstall"       => "reinstall",
                                 "wake"            => "wakeup",
-         # These are currently not supported by the tftp daemon
-                           # "memcheck"        => "memcheck",
-                           # "sysinfo"         => "sysinfo"
+         /* These are currently not supported by the tftp daemon
+                                "memcheck"        => "memcheck",
+                                "sysinfo"         => "sysinfo" */
          );
 
   var $attributes     = array("gotoMode", "gotoTerminalPath", "gotoSwapServer");
diff --git a/systems/admin/systems/class_networkSettings.inc b/systems/admin/systems/class_networkSettings.inc
index 1a776a8d91..b38d661434 100644
--- a/systems/admin/systems/class_networkSettings.inc
+++ b/systems/admin/systems/class_networkSettings.inc
@@ -25,19 +25,18 @@ class networkSettings extends plugin
   /* attribute list for save action */
   var $ignore_account = TRUE;
 
-  /* Basic informations
-   */
   var $attributes     = array("ipHostNumber","macAddress");
   var $objectclasses  = array("whatever");
 
-  var $ipHostNumber          = "";    // IP address
+  var $ipHostNumber          = "";
   var $additionalHostNumbers = array();
-  var $macAddress            = "";    // Mac address
+  var $macAddress            = "";
 
-  var $orig_ipHostNumber   = "";    // IP address
-  var $orig_macAddress     = "";    // Mac address
+  var $orig_ipHostNumber   = "";
+  var $orig_macAddress     = "";
 
-  var $OrigCn         = "";    // Initial cn
+  /* Initial cn */
+  var $OrigCn         = "";
   var $IPisMust       = TRUE;
   var $MACisMust      = TRUE;
   var $dialog         = FALSE;
@@ -65,8 +64,7 @@ class networkSettings extends plugin
       $this->OrigCn = preg_replace('/\$$/', '', $this->attrs[$namingAttr][0]);
     }
 
-    /* Create list of additional ipHostNumber.
-     */
+    /* Create list of additional ipHostNumber. */
     $this->additionalHostNumbers = array();
     if (isset($this->attrs['ipHostNumber']) && $this->attrs['ipHostNumber']['count'] > 1) {
       for ($i = 1; $i < $this->attrs['ipHostNumber']['count']; $i++) {
@@ -289,8 +287,7 @@ class networkSettings extends plugin
     /* Save ip/Mac*/
     parent::save();
 
-    /* Add all additional ipHostNumbers now
-     */
+    /* Add all additional ipHostNumbers now */
     if (!empty($this->ipHostNumber)) {
       $this->attrs['ipHostNumber'] = array($this->ipHostNumber);
     }
@@ -308,8 +305,7 @@ class networkSettings extends plugin
     $this->cleanup();
     $ldap->modify ($this->attrs);
 
-    /* Display errors
-     */
+    /* Display errors */
     if (!$ldap->success()) {
       msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()), LDAP_ERROR);
     }
@@ -317,7 +313,6 @@ class networkSettings extends plugin
     $this->dialog = FALSE;
   }
 
-  /* Return plugin informations for acl handling  */
   static function plInfo()
   {
     return array(
@@ -337,7 +332,7 @@ class networkSettings extends plugin
   function generateRandomIP($net = "")
   {
     global $config;
-    // first gather all IPs
+    /* first gather all IPs */
     $ldap = $config->get_ldap_link();
     $ocs =
       '(objectClass=fdPhone)'.
@@ -356,7 +351,7 @@ class networkSettings extends plugin
       }
     }
 
-    // Set starting ip.
+    /* Set starting ip. */
     $ip_data = preg_split('/\./', $net);
     for ($i = 0;$i < 4;$i++) {
       if (!isset($ip_data[$i])) {
@@ -364,7 +359,7 @@ class networkSettings extends plugin
       }
     }
 
-    // Search the next free and valid ip.
+    /* Search the next free and valid ip. */
     while (in_array(implode('.', $ip_data), $list) || $ip_data[3] <= 1) {
       $ip_data[3]++;
       if ($ip_data[3] >= 255) {
diff --git a/systems/admin/systems/serverService-list.xml b/systems/admin/systems/serverService-list.xml
index b7245e8dfa..0be4b57b6d 100644
--- a/systems/admin/systems/serverService-list.xml
+++ b/systems/admin/systems/serverService-list.xml
@@ -49,13 +49,13 @@
   <actionmenu>
 
     <action>
-     <type>sub</type>
-     <image>geticon.php?context=actions&amp;icon=document-new&amp;size=16</image>
-     <label>Create</label>
+      <type>sub</type>
+      <image>geticon.php?context=actions&amp;icon=document-new&amp;size=16</image>
+      <label>Create</label>
 
-     <action>
-      <!-- List is generated by serverService constructor -->
-     </action>
+      <action>
+          <!-- List is generated by serverService constructor -->
+      </action>
     </action>
 
     <action>
diff --git a/systems/admin/systems/services/shares/class_serviceShare.inc b/systems/admin/systems/services/shares/class_serviceShare.inc
index a056b5ba55..f08bed9f54 100644
--- a/systems/admin/systems/services/shares/class_serviceShare.inc
+++ b/systems/admin/systems/services/shares/class_serviceShare.inc
@@ -23,7 +23,6 @@ class serviceShare extends simpleService
 {
   var $objectclasses = array('goShareServer');
 
-  /* Return plugin informations for acl handling */
   static function plInfo()
   {
     return array(
@@ -74,9 +73,9 @@ class serviceShare extends simpleService
                 ),
               )
             ),
-            FALSE,  // no order
+            FALSE,
             array(),
-            TRUE    // edit button
+            TRUE
           )
         )
       )
diff --git a/systems/admin/systems/system-list.xml b/systems/admin/systems/system-list.xml
index 66e3dcff35..1990c34445 100644
--- a/systems/admin/systems/system-list.xml
+++ b/systems/admin/systems/system-list.xml
@@ -174,33 +174,33 @@
   <actionmenu>
 
     <action>
-     <type>sub</type>
-     <image>geticon.php?context=actions&amp;icon=document-new&amp;size=16</image>
-     <label>Create</label>
+      <type>sub</type>
+      <image>geticon.php?context=actions&amp;icon=document-new&amp;size=16</image>
+      <label>Create</label>
 
-     <action>
+    <action>
       <name>new_goServer</name>
       <type>entry</type>
       <image>geticon.php?context=devices&amp;icon=server&amp;size=16</image>
       <label>Server</label>
       <depends>serverGeneric</depends>
-     </action>
+    </action>
 
-     <action>
+    <action>
       <name>new_gotoWorkstation</name>
       <type>entry</type>
       <image>geticon.php?context=devices&amp;icon=computer&amp;size=16</image>
       <label>Workstation</label>
       <depends>workstationGeneric</depends>
-     </action>
+    </action>
 
-     <action>
+    <action>
       <name>new_gotoTerminal</name>
       <type>entry</type>
       <image>geticon.php?context=devices&amp;icon=terminal&amp;size=16</image>
       <label>Terminal</label>
       <depends>terminalGeneric</depends>
-     </action>
+    </action>
 
     <action>
       <name>new_sambaSamAccount</name>
@@ -210,31 +210,31 @@
       <depends>winstationGeneric</depends>
     </action>
 
-     <action>
+    <action>
       <name>new_fdPrinter</name>
       <type>entry</type>
       <image>geticon.php?context=devices&amp;icon=printer&amp;size=16</image>
       <label>Network printer</label>
       <depends>printGeneric</depends>
-     </action>
+    </action>
 
-     <action>
+    <action>
       <name>new_fdPhone</name>
       <type>entry</type>
       <image>geticon.php?context=devices&amp;icon=telephone&amp;size=16</image>
       <label>Phone</label>
       <depends>phoneGeneric</depends>
-     </action>
+    </action>
 
-     <action>
+    <action>
       <name>new_ieee802Device</name>
       <type>entry</type>
       <image>geticon.php?context=devices&amp;icon=network-device&amp;size=16</image>
       <label>Network device</label>
       <depends>componentGeneric</depends>
-     </action>
+    </action>
 
-     <action>
+    <action>
       <name>new_fdMobilePhone</name>
       <type>entry</type>
       <image>geticon.php?context=devices&amp;icon=phone&amp;size=16</image>
@@ -255,9 +255,9 @@
     </action>
 
     <action>
-     <type>sub</type>
-     <image>geticon.php?context=actions&amp;icon=task-schedule&amp;size=16</image>
-     <label>Schedule action</label>
+      <type>sub</type>
+      <image>geticon.php?context=actions&amp;icon=task-schedule&amp;size=16</image>
+      <label>Schedule action</label>
       <depends>argonautAction</depends>
     </action>
 
diff --git a/user-reminder/html/class_expiredUserPostpone.inc b/user-reminder/html/class_expiredUserPostpone.inc
index 07492fe24e..a1ff7ad519 100644
--- a/user-reminder/html/class_expiredUserPostpone.inc
+++ b/user-reminder/html/class_expiredUserPostpone.inc
@@ -46,7 +46,7 @@ class expiredUserPostpone extends standAlonePage
     }
 
     if (($_SERVER['REQUEST_METHOD'] == 'GET') && isset($_GET['token'])) {
-      # Check if the token match
+      /* Check if the token match */
       $this->uid = $_GET['uid'];
       if ($this->checkToken($_GET['token'])) {
         $this->message = array();
diff --git a/webservice/include/jsonrpcphp/jsonRPCServer.php b/webservice/include/jsonrpcphp/jsonRPCServer.php
index 551200979e..2c0af25e9e 100644
--- a/webservice/include/jsonrpcphp/jsonRPCServer.php
+++ b/webservice/include/jsonrpcphp/jsonRPCServer.php
@@ -1,6 +1,6 @@
 <?php
 /*
-					COPYRIGHT
+          COPYRIGHT
 
 Copyright 2007 Sergio Vaccaro <sergio@inservibile.org>
 Copyright 2013-2016 FusionDirectory
@@ -29,58 +29,58 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * @author sergio <jsonrpcphp@inservibile.org>
  */
 class jsonRPCServer {
-	/**
-	 * This function handle a request binding it to a given object
-	 *
-	 * @param object $object
-	 * @return boolean
-	 */
-	public static function handle($object) {
+  /**
+   * This function handle a request binding it to a given object
+   *
+   * @param object $object
+   * @return boolean
+   */
+  public static function handle($object) {
 
-		// checks if a JSON-RCP request has been received
-		if (
-			$_SERVER['REQUEST_METHOD'] != 'POST' ||
-			empty($_SERVER['CONTENT_TYPE']) ||
-			$_SERVER['CONTENT_TYPE'] != 'application/json'
-			) {
-			// This is not a JSON-RPC request
-			return false;
-		}
+    /* checks if a JSON-RCP request has been received */
+    if (
+      $_SERVER['REQUEST_METHOD'] != 'POST' ||
+      empty($_SERVER['CONTENT_TYPE']) ||
+      $_SERVER['CONTENT_TYPE'] != 'application/json'
+      ) {
+      /* This is not a JSON-RPC request */
+      return false;
+    }
 
-		// reads the input data
-		$request = json_decode(file_get_contents('php://input'),true);
+    /* reads the input data */
+    $request = json_decode(file_get_contents('php://input'),true);
 
-		// executes the task on local object
-		try {
-			if (($result = @call_user_func_array(array($object,$request['method']),$request['params'])) !== FALSE) {
-				$response = array (
-									'id' => $request['id'],
-									'result' => $result,
-									'error' => NULL
-									);
-			} else {
-				$response = array (
-									'id' => $request['id'],
-									'result' => NULL,
-									'error' => 'unknown method or incorrect parameters'
-									);
-			}
-		} catch (Exception $e) {
-			$response = array (
-								'id' => $request['id'],
-								'result' => NULL,
-								'error' => $e->getMessage()
-								);
-		}
+    /* executes the task on local object */
+    try {
+      if (($result = @call_user_func_array(array($object,$request['method']),$request['params'])) !== FALSE) {
+        $response = array (
+                  'id' => $request['id'],
+                  'result' => $result,
+                  'error' => NULL
+                  );
+      } else {
+        $response = array (
+                  'id' => $request['id'],
+                  'result' => NULL,
+                  'error' => 'unknown method or incorrect parameters'
+                  );
+      }
+    } catch (Exception $e) {
+      $response = array (
+                'id' => $request['id'],
+                'result' => NULL,
+                'error' => $e->getMessage()
+                );
+    }
 
-		// output the response
-		if (!empty($request['id'])) { // notifications don't want response
-			header('content-type: text/javascript');
-			echo json_encode($response);
-		}
+    /* output the response */
+    /* notifications don't want response */
+    if (!empty($request['id'])) {
+      header('content-type: text/javascript');
+      echo json_encode($response);
+    }
 
-		// finish
-		return true;
-	}
+    return true;
+  }
 }
 ?>
-- 
GitLab


From 4852976283a2df8975a7befc10841051b792592d Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Tue, 8 Nov 2016 23:58:24 +0100
Subject: [PATCH 43/54] Cleaning minor sonar code compliance Move this trailing
 comment on the previous empty line

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 quota/personal/quota/class_quotaAccount.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quota/personal/quota/class_quotaAccount.inc b/quota/personal/quota/class_quotaAccount.inc
index 5330346b02..15072fd869 100644
--- a/quota/personal/quota/class_quotaAccount.inc
+++ b/quota/personal/quota/class_quotaAccount.inc
@@ -160,9 +160,9 @@ class quotaAccount extends simplePlugin
               ),
               ':'
             ),
-            FALSE,  // no order
+            FALSE,
             array(),
-            TRUE    // edit button
+            TRUE
           )
         )
       ),
-- 
GitLab


From 4a7437cfb0732df445393f5437915e473b4c45cc Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Wed, 9 Nov 2016 00:14:52 +0100
Subject: [PATCH 44/54] Cleaning minor sonar code compliance Move this trailing
 comment on the previous empty line Make this line start at column 7.

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 argonaut/addons/argonaut/deploy-list.xml |   6 +-
 ejbca/admin/ejbca/certificates/main.inc  |   6 +-
 systems/admin/systems/system-list.xml    | 126 +++++++++++------------
 3 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/argonaut/addons/argonaut/deploy-list.xml b/argonaut/addons/argonaut/deploy-list.xml
index 240a055c69..3a750d2802 100644
--- a/argonaut/addons/argonaut/deploy-list.xml
+++ b/argonaut/addons/argonaut/deploy-list.xml
@@ -90,7 +90,7 @@
       <type>separator</type>
     </action>
 
-     <action>
+    <action>
       <name>abort</name>
       <type>entry</type>
       <image>geticon.php?context=actions&amp;icon=process-stop&amp;size=16</image>
@@ -101,12 +101,12 @@
       <type>separator</type>
     </action>
 
-     <action>
+    <action>
       <name>processNow</name>
       <type>entry</type>
       <image>geticon.php?context=types&amp;icon=action&amp;size=16</image>
       <label>Execute</label>
-     </action>
+    </action>
 
   </actionmenu>
 
diff --git a/ejbca/admin/ejbca/certificates/main.inc b/ejbca/admin/ejbca/certificates/main.inc
index d0ca9f2b78..fe304ca414 100644
--- a/ejbca/admin/ejbca/certificates/main.inc
+++ b/ejbca/admin/ejbca/certificates/main.inc
@@ -2,17 +2,17 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2015-2016 FusionDirectory
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
diff --git a/systems/admin/systems/system-list.xml b/systems/admin/systems/system-list.xml
index 1990c34445..1120da489f 100644
--- a/systems/admin/systems/system-list.xml
+++ b/systems/admin/systems/system-list.xml
@@ -178,69 +178,69 @@
       <image>geticon.php?context=actions&amp;icon=document-new&amp;size=16</image>
       <label>Create</label>
 
-    <action>
-      <name>new_goServer</name>
-      <type>entry</type>
-      <image>geticon.php?context=devices&amp;icon=server&amp;size=16</image>
-      <label>Server</label>
-      <depends>serverGeneric</depends>
-    </action>
-
-    <action>
-      <name>new_gotoWorkstation</name>
-      <type>entry</type>
-      <image>geticon.php?context=devices&amp;icon=computer&amp;size=16</image>
-      <label>Workstation</label>
-      <depends>workstationGeneric</depends>
-    </action>
-
-    <action>
-      <name>new_gotoTerminal</name>
-      <type>entry</type>
-      <image>geticon.php?context=devices&amp;icon=terminal&amp;size=16</image>
-      <label>Terminal</label>
-      <depends>terminalGeneric</depends>
-    </action>
-
-    <action>
-      <name>new_sambaSamAccount</name>
-      <type>entry</type>
-      <image>geticon.php?context=devices&amp;icon=computer-windows&amp;size=16</image>
-      <label>winStation</label>
-      <depends>winstationGeneric</depends>
-    </action>
-
-    <action>
-      <name>new_fdPrinter</name>
-      <type>entry</type>
-      <image>geticon.php?context=devices&amp;icon=printer&amp;size=16</image>
-      <label>Network printer</label>
-      <depends>printGeneric</depends>
-    </action>
-
-    <action>
-      <name>new_fdPhone</name>
-      <type>entry</type>
-      <image>geticon.php?context=devices&amp;icon=telephone&amp;size=16</image>
-      <label>Phone</label>
-      <depends>phoneGeneric</depends>
-    </action>
-
-    <action>
-      <name>new_ieee802Device</name>
-      <type>entry</type>
-      <image>geticon.php?context=devices&amp;icon=network-device&amp;size=16</image>
-      <label>Network device</label>
-      <depends>componentGeneric</depends>
-    </action>
-
-    <action>
-      <name>new_fdMobilePhone</name>
-      <type>entry</type>
-      <image>geticon.php?context=devices&amp;icon=phone&amp;size=16</image>
-      <label>Mobile Phone</label>
-      <depends>mobilePhoneGeneric</depends>
-     </action>
+      <action>
+        <name>new_goServer</name>
+        <type>entry</type>
+        <image>geticon.php?context=devices&amp;icon=server&amp;size=16</image>
+        <label>Server</label>
+        <depends>serverGeneric</depends>
+      </action>
+
+      <action>
+        <name>new_gotoWorkstation</name>
+        <type>entry</type>
+        <image>geticon.php?context=devices&amp;icon=computer&amp;size=16</image>
+        <label>Workstation</label>
+        <depends>workstationGeneric</depends>
+      </action>
+
+      <action>
+        <name>new_gotoTerminal</name>
+        <type>entry</type>
+        <image>geticon.php?context=devices&amp;icon=terminal&amp;size=16</image>
+        <label>Terminal</label>
+        <depends>terminalGeneric</depends>
+      </action>
+
+      <action>
+        <name>new_sambaSamAccount</name>
+        <type>entry</type>
+        <image>geticon.php?context=devices&amp;icon=computer-windows&amp;size=16</image>
+        <label>winStation</label>
+        <depends>winstationGeneric</depends>
+      </action>
+
+      <action>
+        <name>new_fdPrinter</name>
+        <type>entry</type>
+        <image>geticon.php?context=devices&amp;icon=printer&amp;size=16</image>
+        <label>Network printer</label>
+        <depends>printGeneric</depends>
+      </action>
+
+      <action>
+        <name>new_fdPhone</name>
+        <type>entry</type>
+        <image>geticon.php?context=devices&amp;icon=telephone&amp;size=16</image>
+        <label>Phone</label>
+        <depends>phoneGeneric</depends>
+      </action>
+
+      <action>
+        <name>new_ieee802Device</name>
+        <type>entry</type>
+        <image>geticon.php?context=devices&amp;icon=network-device&amp;size=16</image>
+        <label>Network device</label>
+        <depends>componentGeneric</depends>
+      </action>
+
+      <action>
+        <name>new_fdMobilePhone</name>
+        <type>entry</type>
+        <image>geticon.php?context=devices&amp;icon=phone&amp;size=16</image>
+        <label>Mobile Phone</label>
+        <depends>mobilePhoneGeneric</depends>
+      </action>
     </action>
 
     <action>
-- 
GitLab


From 2ab23be335725728b60205e7c30172b75ae9714a Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Thu, 10 Nov 2016 22:04:57 +0100
Subject: [PATCH 45/54] Fixes: #5241 css error due to sonar cleanup

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 argonaut/addons/argonaut/import_events.tpl                      | 2 +-
 developers/debug-help/addons/debug-help/debughelp.tpl           | 2 +-
 dns/admin/systems/dnsrecords.tpl                                | 2 +-
 fai/admin/systems/services/repository/fai_repository.tpl        | 2 +-
 fusioninventory/admin/systems/fusioninventory/inventory.tpl     | 2 +-
 ldapdump/addons/ldapdump/ldapdump.tpl                           | 2 +-
 opsi/addons/opsi/opsiimport.tpl                                 | 2 +-
 ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl            | 2 +-
 quota/admin/systems/services/quota/service_quota_parameters.tpl | 2 +-
 quota/personal/quota/quota_section.tpl                          | 2 +-
 squid/personal/squid/proxyAccount.tpl                           | 2 +-
 sudo/admin/sudo/usedoptions_section.tpl                         | 2 +-
 supann/personal/supann/student_subscription.tpl                 | 2 +-
 systems/addons/dashboard/network_dhcp.tpl                       | 2 +-
 systems/addons/dashboard/systems_pcids.tpl                      | 2 +-
 systems/addons/dashboard/systems_stats.tpl                      | 2 +-
 systems/admin/systems/server_import.tpl                         | 2 +-
 systems/admin/systems/services/shares/service_share.tpl         | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/argonaut/addons/argonaut/import_events.tpl b/argonaut/addons/argonaut/import_events.tpl
index 31d72546f6..a8e6844339 100644
--- a/argonaut/addons/argonaut/import_events.tpl
+++ b/argonaut/addons/argonaut/import_events.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}"  class="plugin_section fullwidth">
+<div id="{$sectionId}"  class="plugin-section fullwidth">
   <span class="legend">
     {$section}
   </span>
diff --git a/developers/debug-help/addons/debug-help/debughelp.tpl b/developers/debug-help/addons/debug-help/debughelp.tpl
index 11fb9561c1..909149bc13 100644
--- a/developers/debug-help/addons/debug-help/debughelp.tpl
+++ b/developers/debug-help/addons/debug-help/debughelp.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<div id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <span class="legend">
     {$section}
   </span>
diff --git a/dns/admin/systems/dnsrecords.tpl b/dns/admin/systems/dnsrecords.tpl
index 696c078de2..56ce091d03 100644
--- a/dns/admin/systems/dnsrecords.tpl
+++ b/dns/admin/systems/dnsrecords.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<div id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <span class="legend">
     {$section}
   </span>
diff --git a/fai/admin/systems/services/repository/fai_repository.tpl b/fai/admin/systems/services/repository/fai_repository.tpl
index 12ec41cc99..e8e6bcc8f0 100644
--- a/fai/admin/systems/services/repository/fai_repository.tpl
+++ b/fai/admin/systems/services/repository/fai_repository.tpl
@@ -1,4 +1,4 @@
-<fieldset id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <legend><span><label for="{$attributes.FAIrepository.htmlid}">{$section}</label></span></legend>
   <div>
   <table>
diff --git a/fusioninventory/admin/systems/fusioninventory/inventory.tpl b/fusioninventory/admin/systems/fusioninventory/inventory.tpl
index 1d01055d6b..a076385595 100644
--- a/fusioninventory/admin/systems/fusioninventory/inventory.tpl
+++ b/fusioninventory/admin/systems/fusioninventory/inventory.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<div id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <span class="legend">
     {$section}
   </span>
diff --git a/ldapdump/addons/ldapdump/ldapdump.tpl b/ldapdump/addons/ldapdump/ldapdump.tpl
index 84707095c4..eb47e61067 100644
--- a/ldapdump/addons/ldapdump/ldapdump.tpl
+++ b/ldapdump/addons/ldapdump/ldapdump.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<div id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <span class="legend">
     {$section}
   </span>
diff --git a/opsi/addons/opsi/opsiimport.tpl b/opsi/addons/opsi/opsiimport.tpl
index 87504fb9a9..c6509f8ac2 100644
--- a/opsi/addons/opsi/opsiimport.tpl
+++ b/opsi/addons/opsi/opsiimport.tpl
@@ -8,7 +8,7 @@
   }
 {/literal}
 </style><div></div>
-<fieldset id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <legend><span>{$section}</span></legend>
   <div>
     <p class="warning">{t}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.{/t}</p>
diff --git a/ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl b/ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl
index 7a62c401cf..f5ce671e06 100644
--- a/ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl
+++ b/ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}"  class="plugin_section fullwidth">
+<div id="{$sectionId}"  class="plugin-section fullwidth">
   <span class="legend">
     {$section}
   </span>
diff --git a/quota/admin/systems/services/quota/service_quota_parameters.tpl b/quota/admin/systems/services/quota/service_quota_parameters.tpl
index 905cd0b8c2..d999b12ea0 100644
--- a/quota/admin/systems/services/quota/service_quota_parameters.tpl
+++ b/quota/admin/systems/services/quota/service_quota_parameters.tpl
@@ -1,4 +1,4 @@
-<fieldset id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <legend><span><label for="{$attributes.quotaDeviceParameters.htmlid}">{$section}</label></span></legend>
   <div>
   <table>
diff --git a/quota/personal/quota/quota_section.tpl b/quota/personal/quota/quota_section.tpl
index 8e67e3d6bb..a8f2d7c303 100644
--- a/quota/personal/quota/quota_section.tpl
+++ b/quota/personal/quota/quota_section.tpl
@@ -1,4 +1,4 @@
-<fieldset id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <legend><span><label for="{$attributes.quota.htmlid}">{$section}</label></span></legend>
   <div>
   <table>
diff --git a/squid/personal/squid/proxyAccount.tpl b/squid/personal/squid/proxyAccount.tpl
index 8a7fdb19cb..fc3b79951d 100644
--- a/squid/personal/squid/proxyAccount.tpl
+++ b/squid/personal/squid/proxyAccount.tpl
@@ -1,4 +1,4 @@
-<fieldset id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <legend><span>{$section}</span></legend>
   <div>
     <table>
diff --git a/sudo/admin/sudo/usedoptions_section.tpl b/sudo/admin/sudo/usedoptions_section.tpl
index b49652fa35..a6db780058 100644
--- a/sudo/admin/sudo/usedoptions_section.tpl
+++ b/sudo/admin/sudo/usedoptions_section.tpl
@@ -1,4 +1,4 @@
-<fieldset id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <legend><span>{$section}</span></legend>
   <div>
   <table>
diff --git a/supann/personal/supann/student_subscription.tpl b/supann/personal/supann/student_subscription.tpl
index 658b7288fc..512f1e20d6 100644
--- a/supann/personal/supann/student_subscription.tpl
+++ b/supann/personal/supann/student_subscription.tpl
@@ -1,4 +1,4 @@
-<fieldset id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <legend><span><label for="{$attributes.supannEtuInscription.htmlid}">{$section}</label></span></legend>
   <div>
   <table>
diff --git a/systems/addons/dashboard/network_dhcp.tpl b/systems/addons/dashboard/network_dhcp.tpl
index ab59e32ed5..1a14f13b7e 100644
--- a/systems/addons/dashboard/network_dhcp.tpl
+++ b/systems/addons/dashboard/network_dhcp.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}" class="plugin_section">
+<div id="{$sectionId}" class="plugin-section">
   <span class="legend">
     {$section}
   </span>
diff --git a/systems/addons/dashboard/systems_pcids.tpl b/systems/addons/dashboard/systems_pcids.tpl
index 817d217941..d393c5c64e 100644
--- a/systems/addons/dashboard/systems_pcids.tpl
+++ b/systems/addons/dashboard/systems_pcids.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}" class="plugin_section">
+<div id="{$sectionId}" class="plugin-section">
   <span class="legend">
     {$section}
   </span>
diff --git a/systems/addons/dashboard/systems_stats.tpl b/systems/addons/dashboard/systems_stats.tpl
index b5ecd7f4b2..1a3ad67a86 100644
--- a/systems/addons/dashboard/systems_stats.tpl
+++ b/systems/addons/dashboard/systems_stats.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}" class="plugin_section">
+<div id="{$sectionId}" class="plugin-section">
   <span class="legend">
     {$section}
   </span>
diff --git a/systems/admin/systems/server_import.tpl b/systems/admin/systems/server_import.tpl
index 08c6a9b44c..9a0ac71bbc 100644
--- a/systems/admin/systems/server_import.tpl
+++ b/systems/admin/systems/server_import.tpl
@@ -8,7 +8,7 @@
   }
 {/literal}
 </style><div></div>
-<fieldset id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <legend><span>{$section}</span></legend>
   <div>
     <p class="warning">{t}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.{/t}</p>
diff --git a/systems/admin/systems/services/shares/service_share.tpl b/systems/admin/systems/services/shares/service_share.tpl
index 801a65636b..ae876b6423 100644
--- a/systems/admin/systems/services/shares/service_share.tpl
+++ b/systems/admin/systems/services/shares/service_share.tpl
@@ -1,4 +1,4 @@
-<fieldset id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <legend><span><label for="{$attributes.goExportEntry.htmlid}">{$section}</label></span></legend>
   <div>
   <table>
-- 
GitLab


From 33b6819a44914334270e23c7d2323708122ca807 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Thu, 10 Nov 2016 22:45:39 +0100
Subject: [PATCH 46/54] =?UTF-8?q?Fixes:=20#5239=20Champs=20pour=20enregist?=
 =?UTF-8?q?rer=20la=20volont=C3=A9=20d'afficher=20la=20photo=20de=20la=20p?=
 =?UTF-8?q?ersonne=20sur=20le=20site=20web?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 personal/contrib/openldap/personal-fd.schema      | 8 +++++++-
 personal/personal/personal/class_personalInfo.inc | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/personal/contrib/openldap/personal-fd.schema b/personal/contrib/openldap/personal-fd.schema
index 7fc2ba0f91..fc034fcccb 100644
--- a/personal/contrib/openldap/personal-fd.schema
+++ b/personal/contrib/openldap/personal-fd.schema
@@ -39,6 +39,12 @@ attributetype ( 1.3.6.1.4.1.38414.48.1.6 NAME 'fdBadge'
   SUBSTR caseExactIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
+attributetype ( 1.3.6.1.4.1.38414.48.1.7 NAME 'fdPhotoVisible'
+  DESC 'FusionDirectory - Tell if user Photo should be visible on external tools'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  SINGLE-VALUE )
+
 # GOsa stuff
 
 attributetype ( 1.3.6.1.4.1.15305.2.1 NAME ( 'gender' 'sex' )
@@ -58,4 +64,4 @@ objectclass (1.3.6.1.4.1.38414.48.2.1 NAME 'fdPersonalInfo' SUP top AUXILIARY
   DESC 'FusionDirectory - User personal tab'
   MUST ( )
   MAY ( fdSocialAccount $ fdNickName $ fdPrivateMail $ fdBadge $
-        personalTitle $ dateOfBirth $ gender $ fdContractStartDate $ fdContractEndDate $ co ))
+        personalTitle $ dateOfBirth $ gender $ fdContractStartDate $ fdContractEndDate $ fdPhotoVisible $ co ))
diff --git a/personal/personal/personal/class_personalInfo.inc b/personal/personal/personal/class_personalInfo.inc
index 33bccb8d79..3ed3f08a21 100644
--- a/personal/personal/personal/class_personalInfo.inc
+++ b/personal/personal/personal/class_personalInfo.inc
@@ -138,6 +138,10 @@ class personalInfo extends simplePlugin
             'fdContractEndDate', FALSE,
             'YmdHis\Z', ''
           ),
+          new BooleanAttribute (
+            _('Photo Visible'), _('Should the photo of the user be visible on external tools'),
+            'fdPhotoVisible', FALSE, TRUE
+          ),
         )
       ),
       'contact' => array(
-- 
GitLab


From 8b75b1575cbbb0108681d464c20bda75c05c45fa Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Thu, 10 Nov 2016 22:30:57 +0100
Subject: [PATCH 47/54] Fixes: #5236 Missed icon in the fusioninventory plugin

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 .../admin/systems/fusioninventory/class_fiInventory.inc         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc b/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc
index 0e1b441234..87bfbfa173 100644
--- a/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc
+++ b/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc
@@ -73,7 +73,7 @@ class fiInventory extends simplePlugin
           'description' => _('Inventory object'),
           'filter'      => 'objectClass=fdInventoryContent',
           'mainAttr'    => 'cn',
-          'icon'        => 'geticon.php?context=applications&icon=nagios&size=16',
+          'icon'        => 'geticon.php?context=applications&icon=fusioninventory&size=16',
           'name'        => _('Inventory object'),
           'ou'          => get_ou('inventoryRDN'),
           'tabClass'    => 'simpleTabs_noSpecial',
-- 
GitLab


From 2a7788a2a6bd69854c70236393af43ed1816b82c Mon Sep 17 00:00:00 2001
From: Swaelens Jonathan <jonathan@opensides.be>
Date: Sat, 12 Nov 2016 16:23:58 +0100
Subject: [PATCH 48/54] Fixes #5232 Choice explicitly DHCP Primary Server and
 DHCP Secondary Server

---
 dhcp/admin/dhcp/class_dhcpConfiguration.inc            | 6 ------
 dhcp/admin/dhcp/sections/class_dhcpService.inc         | 3 ++-
 dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index 881aa50585..b4bf2b321e 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -252,12 +252,6 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
     return $this->dhcpObjectCache[$this->value[0][0]]['cn'][0];
   }
 
-  public function setPrimaryDn ($dn)
-  {
-    $this->dhcpObjectCache[$this->value[0][0]]['dhcpPrimaryDN']  = array($dn);
-    $this->dhcpObjectCache[$this->value[0][0]]['MODIFIED']       = TRUE;
-  }
-
   /* Subfonction of reload function */
   protected function reload_readItemFromLDAP(&$ldap, $attrs, &$final, $erase)
   {
diff --git a/dhcp/admin/dhcp/sections/class_dhcpService.inc b/dhcp/admin/dhcp/sections/class_dhcpService.inc
index dc1e8982e0..e1a2141af7 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpService.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpService.inc
@@ -33,7 +33,8 @@ class dhcpService extends dhcpPlugin
         'ddns-update-style none'
       )
     );
-    $attributesInfo['main']['attrs'][] = new HiddenAttribute('dhcpPrimaryDN');
+    $attributesInfo['main']['attrs'][] = new ObjectSelectAttribute(_('DHCP Primary'), _('Primary DHCP server'), 'dhcpPrimaryDN', FALSE, 'server');
+    $attributesInfo['main']['attrs'][] = new ObjectSelectAttribute(_('DHCP Secondary'), _('Secondary DHCP server'), 'dhcpSecondaryDN', FALSE, 'server');
     return $attributesInfo;
   }
 }
diff --git a/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc b/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
index 1bb3fbef04..98a6ae3d64 100644
--- a/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
+++ b/dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc
@@ -74,7 +74,6 @@ class serviceDHCP extends simpleService
     $dhcpServiceDN = $this->dhcpServiceDN;
     foreach ($dhcpServiceDN as $dn) {
       $tabObject = objects::open($dn, 'dhcpConfiguration');
-      $tabObject->getBaseObject()->setPrimaryServer($this->dn);
       $tabObject->save();
     }
   }
-- 
GitLab


From ce209743946aa3a2c73fa8384e3b7776a6c07d74 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Sun, 13 Nov 2016 13:05:11 +0100
Subject: [PATCH 49/54] Fixes: #5232 we miss a dropdown for failover in the
 Create new DHCP section

Putting default values for primary and secondary in failover setpu

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
index dc1f193e1e..bcc5bc1c06 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
@@ -39,7 +39,7 @@ class dhcpFailOverPeer extends dhcpPlugin
           new IntAttribute (
             _('Primary port'), _('Port on which primary server listens for connections from its fail over peer (secondary server)'),
             'dhcpFailOverPrimaryPort', TRUE,
-            0, FALSE
+            519, FALSE
           ),
           new StringAttribute (
             _('Secondary server'), _('IP address or DNS name of the server playing secondary role in DHC Load Balancing and Fail over'),
@@ -48,17 +48,17 @@ class dhcpFailOverPeer extends dhcpPlugin
           new IntAttribute (
             _('Secondary port'), _('Port on which secondary server listens for connections from its fail over peer (primary server)'),
             'dhcpFailOverSecondaryPort', TRUE,
-            0, FALSE
+            520, FALSE
           ),
           new TimeAttribute (
             _('Response delay'), _('Maximum response time in seconds, before Server assumes that connection to fail over peer has failed'),
             'dhcpFailOverResponseDelay', FALSE,
-            0, FALSE
+            60, FALSE
           ),
           new IntAttribute (
             _('Unacked updates'), _('Number of BNDUPD messages that server can send before it receives BNDACK from its fail over peer'),
             'dhcpFailOverUnackedUpdates', FALSE,
-            0, FALSE
+            10, FALSE
           ),
           new TimeAttribute (
             _('Maximum Client Lead Time'), _('Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]'),
@@ -77,7 +77,7 @@ class dhcpFailOverPeer extends dhcpPlugin
           new TimeAttribute (
             _('Load balance time'), _('Cutoff time in seconds, after which load balance is disabled'),
             'dhcpFailOverLoadBalanceTime', FALSE,
-            0, FALSE
+            3, FALSE
           ),
           new TextAreaAttribute (
             _('Comments'), _('Comments about this DHCP object'),
-- 
GitLab


From d821f47fe03c58676c98ef78f365d8405605557c Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Sun, 13 Nov 2016 16:24:56 +0100
Subject: [PATCH 50/54] Fixes: #5226 audit showing an error everytime we save
 an dhcp object

added temporary workaround for autdit error in systems when adding dhcp objects

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 dhcp/admin/systems/class_dhcpSystem.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dhcp/admin/systems/class_dhcpSystem.inc b/dhcp/admin/systems/class_dhcpSystem.inc
index 0990718053..d78cdde782 100644
--- a/dhcp/admin/systems/class_dhcpSystem.inc
+++ b/dhcp/admin/systems/class_dhcpSystem.inc
@@ -286,6 +286,9 @@ class dhcpSystem extends simplePlugin
   {
     global $config;
 
+    /* workaround for audit strange errors */
+    $this->ldap_error = 'Success';
+
     $ldap = $config->get_ldap_link();
     $baseObject = $this->parent->getBaseObject();
     return $this->attributesAccess['dhcpHosts']->postLdapSave(
-- 
GitLab


From 5b41b97130891b0afa36e733d270bea0c6f93a77 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Sun, 13 Nov 2016 17:13:19 +0100
Subject: [PATCH 51/54] Fixes: #5232 we miss a dropdown for failover in the
 Create new DHCP section

Putting default values for primary and secondary in failover setpu

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
index bcc5bc1c06..54fe01fc77 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
@@ -39,7 +39,7 @@ class dhcpFailOverPeer extends dhcpPlugin
           new IntAttribute (
             _('Primary port'), _('Port on which primary server listens for connections from its fail over peer (secondary server)'),
             'dhcpFailOverPrimaryPort', TRUE,
-            519, FALSE
+            0, FALSE, 519
           ),
           new StringAttribute (
             _('Secondary server'), _('IP address or DNS name of the server playing secondary role in DHC Load Balancing and Fail over'),
@@ -48,17 +48,17 @@ class dhcpFailOverPeer extends dhcpPlugin
           new IntAttribute (
             _('Secondary port'), _('Port on which secondary server listens for connections from its fail over peer (primary server)'),
             'dhcpFailOverSecondaryPort', TRUE,
-            520, FALSE
+            0, FALSE, 520
           ),
           new TimeAttribute (
             _('Response delay'), _('Maximum response time in seconds, before Server assumes that connection to fail over peer has failed'),
             'dhcpFailOverResponseDelay', FALSE,
-            60, FALSE
+            0, FALSE, 60
           ),
           new IntAttribute (
             _('Unacked updates'), _('Number of BNDUPD messages that server can send before it receives BNDACK from its fail over peer'),
             'dhcpFailOverUnackedUpdates', FALSE,
-            10, FALSE
+            0, FALSE, 10
           ),
           new TimeAttribute (
             _('Maximum Client Lead Time'), _('Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]'),
@@ -77,7 +77,7 @@ class dhcpFailOverPeer extends dhcpPlugin
           new TimeAttribute (
             _('Load balance time'), _('Cutoff time in seconds, after which load balance is disabled'),
             'dhcpFailOverLoadBalanceTime', FALSE,
-            3, FALSE
+            0, FALSE, 3
           ),
           new TextAreaAttribute (
             _('Comments'), _('Comments about this DHCP object'),
-- 
GitLab


From b5459fafab05695c36455cf6755b39b3b79c5a35 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Sun, 13 Nov 2016 18:03:22 +0100
Subject: [PATCH 52/54] Updating locales for 1.0.17

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 dhcp/locale/ar/fusiondirectory.po          |  74 +++--
 dhcp/locale/ca/fusiondirectory.po          |  74 +++--
 dhcp/locale/cs_CZ/fusiondirectory.po       |  74 +++--
 dhcp/locale/de/fusiondirectory.po          |  74 +++--
 dhcp/locale/el_GR/fusiondirectory.po       |  74 +++--
 dhcp/locale/en/fusiondirectory.po          | 343 ++++++++++++++-------
 dhcp/locale/es/fusiondirectory.po          |  74 +++--
 dhcp/locale/es_CO/fusiondirectory.po       |  74 +++--
 dhcp/locale/es_VE/fusiondirectory.po       |  74 +++--
 dhcp/locale/fa_IR/fusiondirectory.po       |  74 +++--
 dhcp/locale/fi_FI/fusiondirectory.po       |  74 +++--
 dhcp/locale/fr/fusiondirectory.po          |  74 +++--
 dhcp/locale/hu_HU/fusiondirectory.po       |  74 +++--
 dhcp/locale/id/fusiondirectory.po          |  74 +++--
 dhcp/locale/it_IT/fusiondirectory.po       |  74 +++--
 dhcp/locale/lv/fusiondirectory.po          |  74 +++--
 dhcp/locale/nb/fusiondirectory.po          |  74 +++--
 dhcp/locale/nl/fusiondirectory.po          |  74 +++--
 dhcp/locale/pl/fusiondirectory.po          |  74 +++--
 dhcp/locale/pt/fusiondirectory.po          |  74 +++--
 dhcp/locale/pt_BR/fusiondirectory.po       |  74 +++--
 dhcp/locale/ru/fusiondirectory.po          |  74 +++--
 dhcp/locale/ru@petr1708/fusiondirectory.po |  74 +++--
 dhcp/locale/sv/fusiondirectory.po          |  74 +++--
 dhcp/locale/ug/fusiondirectory.po          |  74 +++--
 dhcp/locale/vi_VN/fusiondirectory.po       |  74 +++--
 dhcp/locale/zh/fusiondirectory.po          |  74 +++--
 27 files changed, 1402 insertions(+), 865 deletions(-)

diff --git a/dhcp/locale/ar/fusiondirectory.po b/dhcp/locale/ar/fusiondirectory.po
index 9bab5b2651..e81e8b7eef 100644
--- a/dhcp/locale/ar/fusiondirectory.po
+++ b/dhcp/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "الإسم"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "خطأ"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "مجموعة"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ca/fusiondirectory.po b/dhcp/locale/ca/fusiondirectory.po
index 149c5aa6ca..7ee349f75c 100644
--- a/dhcp/locale/ca/fusiondirectory.po
+++ b/dhcp/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/cs_CZ/fusiondirectory.po b/dhcp/locale/cs_CZ/fusiondirectory.po
index a52174980c..832b41b7ce 100644
--- a/dhcp/locale/cs_CZ/fusiondirectory.po
+++ b/dhcp/locale/cs_CZ/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr "Nastavení DHCP"
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -73,12 +73,12 @@ msgstr "Sbalit DHCP podsíť"
 msgid "Fold"
 msgstr "Sbalit"
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Vložit novou DHCP sekci"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -86,74 +86,74 @@ msgstr "Vložit novou DHCP sekci"
 msgid "Name"
 msgstr "Název"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr "Celkové předvolby"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Chyba"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "Nastavení DHCP jsou neznámá. Kontaktujte svého správce systémů."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr "DHCP sekce, obsluhovaná tímto serverem"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr "Protokolování"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Třída"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr "Podtřída"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Počítač"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "skupina"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "rozsah"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Podsíť"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr "Protějšek, který převezme služby v případě selhání"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr "Sdílená síť"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr "klíč pro aktualizaci DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr "zóny aktualizace DNS"
 
@@ -365,6 +365,22 @@ msgstr "Síťová adresa"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -439,14 +455,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/de/fusiondirectory.po b/dhcp/locale/de/fusiondirectory.po
index ae5607148c..678156f5c4 100644
--- a/dhcp/locale/de/fusiondirectory.po
+++ b/dhcp/locale/de/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -20,9 +20,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr "DHCP-Konfiguration"
 
@@ -46,7 +46,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -74,12 +74,12 @@ msgstr "DHCP Subnetz verwerfen"
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Füge neue DHCP-Sektion ein"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -87,74 +87,74 @@ msgstr "Füge neue DHCP-Sektion ein"
 msgid "Name"
 msgstr "Name"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr "Globale Optionen"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren System-Administrator."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr "Protokollierung"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "System"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Vorrat"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnetz"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr "Host für Ausfallsicherung"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr "Verteiltes Netzwerk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr "DNS-Update-Schlüssel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr "DNS-Update-Zonen"
 
@@ -366,6 +366,22 @@ msgstr "Netzwerk-Adresse"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -440,14 +456,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/el_GR/fusiondirectory.po b/dhcp/locale/el_GR/fusiondirectory.po
index 5e117671dc..a2dafcd71d 100644
--- a/dhcp/locale/el_GR/fusiondirectory.po
+++ b/dhcp/locale/el_GR/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -20,9 +20,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr "Ρύθμιση DHCP"
 
@@ -46,7 +46,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -74,12 +74,12 @@ msgstr "Συρρίκνωση υποδικτύου DHCP"
 msgid "Fold"
 msgstr "Fold"
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Εισαγωγή νέας ενότητας DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -87,74 +87,74 @@ msgstr "Εισαγωγή νέας ενότητας DHCP"
 msgid "Name"
 msgstr "Όνομα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr "Καθολικές επιλογές"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr "Τα τμήματα του DHCP που διαχειρίζεται αυτός ο διακομιστής."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr "Καταγραφή"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Class"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr "Subclass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Όνομα συστήματος"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Ομάδα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Ομάδα"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Υποδίκτυο"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr "Κοινόχρηστο  δίκτυο"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr "Κλειδί ενημέρωσης DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr "Ζώνες ενημέρωσης DNS"
 
@@ -366,6 +366,22 @@ msgstr "Διεύθυνση δικτύου"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -440,14 +456,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/en/fusiondirectory.po b/dhcp/locale/en/fusiondirectory.po
index 58942b2c35..97b16e9aee 100644
--- a/dhcp/locale/en/fusiondirectory.po
+++ b/dhcp/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-10-15 18:02+0200\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,67 +17,45 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/class_dhcpSystem.inc:29
-msgid "The DHCP configuration or subsection in which this host should be added"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:33
-msgid "The Mac address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:37
-msgid "The IP address to use in the DHCP host record"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:218
-#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-msgid "DHCP"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:219
-msgid "Edit the DHCP zones of a system"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:233
-msgid "DHCP zones"
-msgstr ""
-
-#: admin/systems/class_dhcpSystem.inc:237
-msgid "DHCP hosts declared for this system"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
-msgid "DHCP configurations"
+#: config/dhcp/class_dhcpConfig.inc:28
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
+msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
-msgid ""
-"The DN of dhcpService object(s) which contain the configuration information"
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
-msgid "Start service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
-msgid "Stop service"
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
-msgid "Restart service"
+#: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+#: admin/systems/class_dhcpSystem.inc:215
+msgid "DHCP"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:35
 msgid "DHCP Management"
 msgstr ""
 
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
 #: admin/dhcp/class_dhcpConfiguration.inc:36
 msgid "Expand DHCP subnet"
 msgstr ""
@@ -94,97 +72,92 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:105
-#: admin/dhcp/class_dhcpConfiguration.inc:106
+#: admin/dhcp/class_dhcpConfiguration.inc:110
+#: admin/dhcp/class_dhcpConfiguration.inc:111
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:239
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:354
-#: admin/dhcp/class_dhcpConfiguration.inc:395
-#: admin/dhcp/class_dhcpConfiguration.inc:504
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:410
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:465
-#: admin/dhcp/class_dhcpConfiguration.inc:466
-#: admin/dhcp/class_dhcpConfiguration.inc:468
-#: config/dhcp/class_dhcpConfig.inc:28
-msgid "DHCP configuration"
-msgstr ""
-
-#: admin/dhcp/class_dhcpConfiguration.inc:482
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:492
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:503
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:505
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:506
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:507
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:508
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:509
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:510
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:511
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:513
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:514
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:32
 msgid "Name of this DHCP configuration"
@@ -207,12 +180,14 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:44
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:45
 msgid "Comments about this DHCP object"
@@ -230,27 +205,132 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-msgid "Range"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:33
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
 msgid ""
-"The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be "
-"specified with no hyphen. Each range is defined as a separate value."
+"IP address or DNS name of the server playing primary role in DHC Load "
+"Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
-msgid "Permit list"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
 msgid ""
-"This attribute contains the permit lists associated with a pool. Each permit "
-"list is defined as a separate value."
+"Port on which primary server listens for connections from its fail over peer "
+"(secondary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid "Secondary server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+msgid ""
+"IP address or DNS name of the server playing secondary role in DHC Load "
+"Balancing and Fail over"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid "Secondary port"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+msgid ""
+"Port on which secondary server listens for connections from its fail over "
+"peer (primary server)"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid "Response delay"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+msgid ""
+"Maximum response time in seconds, before Server assumes that connection to "
+"fail over peer has failed"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid "Unacked updates"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+msgid ""
+"Number of BNDUPD messages that server can send before it receives BNDACK "
+"from its fail over peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+msgid ""
+"Maximum Client Lead Time configuration in seconds, as defined in DHCP "
+"Failover Protocol [FAILOVR]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+msgid "Split between the primary and secondary servers for fail over purpose"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+msgid ""
+"HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
+"Balancing Algorithm [RFC 3074]"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+msgid "Cutoff time in seconds, after which load balance is disabled"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "DNS Zone Server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+msgid "Master server of the DNS Zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "Tsig key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+msgid "The TSig key DN"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+msgid "Secret to generate TSIG Key"
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpSubnet.inc:32
@@ -263,6 +343,19 @@ msgid ""
 "this length."
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:38
+#: admin/dhcp/sections/class_dhcpPool.inc:33
+msgid ""
+"The starting & ending IP Addresses in the range (inclusive), separated by a "
+"hyphen; if the range only contains one address, then just the address can be "
+"specified with no hyphen. Each range is defined as a separate value."
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpSubnet.inc:45
 msgid "Network address"
 msgstr ""
@@ -271,20 +364,30 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
-msgid "DNS Zone Server"
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
-msgid "Master server of the DNS Zone"
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
-msgid "Tsig key"
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
-msgid "The TSig key DN"
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Permit list"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid ""
+"This attribute contains the permit lists associated with a pool. Each permit "
+"list is defined as a separate value."
 msgstr ""
 
 #: admin/dhcp/sections/class_dhcpHost.inc:32
@@ -312,34 +415,52 @@ msgstr ""
 msgid "Hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:34
+msgid ""
+"The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
-msgid "Secret to generate TSIG Key"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:52
+msgid "Start service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:29
-msgid "FusionDirectory dhcp plugin configuration"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:54
+msgid "Stop service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:41
-msgid "DHCP config"
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:56
+msgid "Restart service"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "DHCP RDN"
+#: admin/systems/class_dhcpSystem.inc:29
+msgid "The DHCP configuration or subsection in which this host should be added"
 msgstr ""
 
-#: config/dhcp/class_dhcpConfig.inc:44
-msgid "Branch in which DHCP configurations will be stored"
+#: admin/systems/class_dhcpSystem.inc:33
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:37
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:216
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:230
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:234
+msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/es/fusiondirectory.po b/dhcp/locale/es/fusiondirectory.po
index 2f21cc8ae5..6bc913b994 100644
--- a/dhcp/locale/es/fusiondirectory.po
+++ b/dhcp/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr "Configuración DHCP"
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva sección DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr "Insertar nueva sección DHCP"
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "La configuración DHCP es desconocida. Contacte con su administrador de sistemas."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Clase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr "Llave de actualización DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr "Zonas de actualización DNS"
 
@@ -364,6 +364,22 @@ msgstr "Dirección de red"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/es_CO/fusiondirectory.po b/dhcp/locale/es_CO/fusiondirectory.po
index 640d1e433e..f319504a8d 100644
--- a/dhcp/locale/es_CO/fusiondirectory.po
+++ b/dhcp/locale/es_CO/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "GRupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/es_VE/fusiondirectory.po b/dhcp/locale/es_VE/fusiondirectory.po
index a3d57f47c7..3c4c4e6423 100644
--- a/dhcp/locale/es_VE/fusiondirectory.po
+++ b/dhcp/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr "Configuración DHCP"
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva sección DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr "Insertar nueva sección DHCP"
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "La configuración DHCP es desconocida. Contacte con su administrador de sistemas."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Clase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr "Llave de actualización DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr "Zonas de actualización DNS"
 
@@ -364,6 +364,22 @@ msgstr "Dirección de red"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/fa_IR/fusiondirectory.po b/dhcp/locale/fa_IR/fusiondirectory.po
index 52f4e948a4..44c889f966 100644
--- a/dhcp/locale/fa_IR/fusiondirectory.po
+++ b/dhcp/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "خطا"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/fi_FI/fusiondirectory.po b/dhcp/locale/fi_FI/fusiondirectory.po
index 21fa4cf56a..1c8708018a 100644
--- a/dhcp/locale/fi_FI/fusiondirectory.po
+++ b/dhcp/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/fr/fusiondirectory.po b/dhcp/locale/fr/fusiondirectory.po
index 7d3c6fd585..aaff372fdd 100644
--- a/dhcp/locale/fr/fusiondirectory.po
+++ b/dhcp/locale/fr/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-03 15:55+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:57+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,9 +20,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr "Configuration DHCP"
 
@@ -46,7 +46,7 @@ msgstr "Branches où seront stockées les configurations dhcp"
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -74,12 +74,12 @@ msgstr "Replier le sous réseau"
 msgid "Fold"
 msgstr "Replier"
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Insérer une nouvelle section DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -87,74 +87,74 @@ msgstr "Insérer une nouvelle section DHCP"
 msgid "Name"
 msgstr "Nom"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr "Options globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "La configuration DHCP est inconnue. Veuillez contacter votre administrateur système."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr "Objets dhcp"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr "Les sections DHCP gérées par ce serveur"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr "Journaux systèmes"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr "Sous classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Hôte"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Groupe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Réservoir"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Sous réseau"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr "Pair de reprise sur panne"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr "Réseau partagé"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr "Clef de mise à jour du DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr "Zones DNS à mettre à jour"
 
@@ -366,6 +366,22 @@ msgstr "Adresse réseau"
 msgid "Network address of this subnet"
 msgstr "Adresse réseau de ce sous-réseau"
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr "Serveur Primaire"
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr "Serveur DHCP primaire"
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr "Serveur Secondaire"
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr "Serveur DHCP secondaire"
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr "Liste de permissions"
@@ -440,14 +456,14 @@ msgstr "L'adresse Mac à utiliser dans l'enregistrement d'hôte DHCP"
 msgid "The IP address to use in the DHCP host record"
 msgstr "L'adresse IP à utiliser dans l'enregistrement d'hôte DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr "Modifier les zones DHCP d'un système"
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr "Zones DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr "Hôtes dhcp déclarés pour ce système"
diff --git a/dhcp/locale/hu_HU/fusiondirectory.po b/dhcp/locale/hu_HU/fusiondirectory.po
index d1ed65ae52..9401cb5b2b 100644
--- a/dhcp/locale/hu_HU/fusiondirectory.po
+++ b/dhcp/locale/hu_HU/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Név"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/id/fusiondirectory.po b/dhcp/locale/id/fusiondirectory.po
index cd4ebc115e..2737e901dc 100644
--- a/dhcp/locale/id/fusiondirectory.po
+++ b/dhcp/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/it_IT/fusiondirectory.po b/dhcp/locale/it_IT/fusiondirectory.po
index 85971d3ea7..cff56fc6a0 100644
--- a/dhcp/locale/it_IT/fusiondirectory.po
+++ b/dhcp/locale/it_IT/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-03 09:38+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 15:44+0000\n"
 "Last-Translator: Paola Penati <penati@avaya.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -20,9 +20,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr "Configurazione del DHCP"
 
@@ -46,7 +46,7 @@ msgstr "Ramo in cui le configurazioni DHCP saranno immagazzinate"
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -74,12 +74,12 @@ msgstr "Ripiega la sottorete DHCP"
 msgid "Fold"
 msgstr "Piega"
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Inserisci una nuova sezione DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -87,74 +87,74 @@ msgstr "Inserisci una nuova sezione DHCP"
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr "Opzioni globali"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Errore"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "La configurazione DHCP impostata è sconosciuta. Contatta l'amministratore del sistema."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr "Oggetti DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr "Sezioni DHCP gestite da questo server"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr "Giornale di sistema"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Categoria"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr "Sottoclasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Gruppo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Deposito"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Sottorete"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr "Partner per la presa di controllo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr "Rete condivisa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr "Stile di aggiornamento dinamico del DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr "Aggiornamento delle zone DNS"
 
@@ -366,6 +366,22 @@ msgstr "Indirizzo di rete"
 msgid "Network address of this subnet"
 msgstr "Indirizzo di rete di questa sottorete"
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr "DHCP Primario"
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr "Server DHCP primario"
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr "DHCP Secondario"
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr "Server DHCP secondario"
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr "Lista dei permessi"
@@ -440,14 +456,14 @@ msgstr "Indirizzo MAC da utilizzare nella registrazione dell'host DHCP"
 msgid "The IP address to use in the DHCP host record"
 msgstr "Indirizzo IP da utilizzare nella registrazione dell'host DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr "Modifica le zone DHCP di un sistema"
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr "Zone DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr "Hosts DHCP dichiarati per questo sistema"
diff --git a/dhcp/locale/lv/fusiondirectory.po b/dhcp/locale/lv/fusiondirectory.po
index 90d2fdf9e0..5ccf595977 100644
--- a/dhcp/locale/lv/fusiondirectory.po
+++ b/dhcp/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Vārds "
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Kļūda"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/nb/fusiondirectory.po b/dhcp/locale/nb/fusiondirectory.po
index 4c4d3615fa..6752c58c89 100644
--- a/dhcp/locale/nb/fusiondirectory.po
+++ b/dhcp/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Navn"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Feil"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Vert"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/nl/fusiondirectory.po b/dhcp/locale/nl/fusiondirectory.po
index e786747a2a..c9d44b307e 100644
--- a/dhcp/locale/nl/fusiondirectory.po
+++ b/dhcp/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr "DHCP configuratie"
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -72,12 +72,12 @@ msgstr "Verklein DHCP subnet"
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Voer nieuwe DHCP sectie in"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr "Voer nieuwe DHCP sectie in"
 msgid "Name"
 msgstr "Naam"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr "Globale opties"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Fout"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "De ingestelde DHCP configuratie is onbekend. Neem contact op met uw systeembeheerder."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr "Loggen"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Groep"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnet"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr "Gedeeld netwerk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr "DNS update sleutel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr "DNS update zones"
 
@@ -364,6 +364,22 @@ msgstr "Netwerkadres"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/pl/fusiondirectory.po b/dhcp/locale/pl/fusiondirectory.po
index 66a7bb1405..10928512c0 100644
--- a/dhcp/locale/pl/fusiondirectory.po
+++ b/dhcp/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Błąd"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Klasa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Grupa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr "Adres sieciowy"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/pt/fusiondirectory.po b/dhcp/locale/pt/fusiondirectory.po
index 707fca31dd..0ebcdc7285 100644
--- a/dhcp/locale/pt/fusiondirectory.po
+++ b/dhcp/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/pt_BR/fusiondirectory.po b/dhcp/locale/pt_BR/fusiondirectory.po
index 410a91fac1..4f7565bc7c 100644
--- a/dhcp/locale/pt_BR/fusiondirectory.po
+++ b/dhcp/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Inserir nova seção DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr "Inserir nova seção DHCP"
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "A configuração de DHCP é desconhecida. Por favor, contacte seu administrador do sistema."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr "Logando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr "Endereço de rede"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ru/fusiondirectory.po b/dhcp/locale/ru/fusiondirectory.po
index 2528242930..eb75cde12e 100644
--- a/dhcp/locale/ru/fusiondirectory.po
+++ b/dhcp/locale/ru/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -73,12 +73,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -86,74 +86,74 @@ msgstr ""
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Ошибка"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Хост"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Группа"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -365,6 +365,22 @@ msgstr "Сетевой адрес"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -439,14 +455,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ru@petr1708/fusiondirectory.po b/dhcp/locale/ru@petr1708/fusiondirectory.po
index 29e995f3b8..d313baf705 100644
--- a/dhcp/locale/ru@petr1708/fusiondirectory.po
+++ b/dhcp/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/sv/fusiondirectory.po b/dhcp/locale/sv/fusiondirectory.po
index ba35978edf..182216e1d0 100644
--- a/dhcp/locale/sv/fusiondirectory.po
+++ b/dhcp/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr "Minimera DHCP-subnät"
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Infoga ny DHCP-sektion"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr "Infoga ny DHCP-sektion"
 msgid "Name"
 msgstr "Namn"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr "Globala inställningar"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Fel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "DHCP-konfigurationen är okänd. Kontakta systemadministratören"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr "Loggning"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "Klass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr "Subklass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Grupp"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr "Subnät"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr "Delat nätverk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr "DNS-uppdateringsnyckel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr "DNS-uppdateringszoner"
 
@@ -364,6 +364,22 @@ msgstr "Nätverksadress"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ug/fusiondirectory.po b/dhcp/locale/ug/fusiondirectory.po
index 98f95901b0..997760b66f 100644
--- a/dhcp/locale/ug/fusiondirectory.po
+++ b/dhcp/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/vi_VN/fusiondirectory.po b/dhcp/locale/vi_VN/fusiondirectory.po
index 57f78838bf..c2fc425105 100644
--- a/dhcp/locale/vi_VN/fusiondirectory.po
+++ b/dhcp/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "Tên"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "Nhóm "
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/zh/fusiondirectory.po b/dhcp/locale/zh/fusiondirectory.po
index 3372823f31..2724a32cd7 100644
--- a/dhcp/locale/zh/fusiondirectory.po
+++ b/dhcp/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-11-02 23:08+0100\n"
-"PO-Revision-Date: 2016-11-02 22:08+0000\n"
+"POT-Creation-Date: 2016-11-13 12:54+0100\n"
+"PO-Revision-Date: 2016-11-13 11:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:485
-#: admin/dhcp/class_dhcpConfiguration.inc:486
-#: admin/dhcp/class_dhcpConfiguration.inc:488
+#: admin/dhcp/class_dhcpConfiguration.inc:478
+#: admin/dhcp/class_dhcpConfiguration.inc:479
+#: admin/dhcp/class_dhcpConfiguration.inc:481
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:215
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
+#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
-#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:247
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:32
@@ -85,74 +85,74 @@ msgstr ""
 msgid "Name"
 msgstr "名称"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:373
-#: admin/dhcp/class_dhcpConfiguration.inc:414
-#: admin/dhcp/class_dhcpConfiguration.inc:524
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:517
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "错误"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:429
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:502
+#: admin/dhcp/class_dhcpConfiguration.inc:495
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:512
+#: admin/dhcp/class_dhcpConfiguration.inc:505
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:523
+#: admin/dhcp/class_dhcpConfiguration.inc:516
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:525
+#: admin/dhcp/class_dhcpConfiguration.inc:518
 msgid "Class"
 msgstr "ç±»"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:526
+#: admin/dhcp/class_dhcpConfiguration.inc:519
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:527
+#: admin/dhcp/class_dhcpConfiguration.inc:520
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:528
+#: admin/dhcp/class_dhcpConfiguration.inc:521
 msgid "Group"
 msgstr "组"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:529
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:530
+#: admin/dhcp/class_dhcpConfiguration.inc:523
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:531
+#: admin/dhcp/class_dhcpConfiguration.inc:524
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:525
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:526
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:534
+#: admin/dhcp/class_dhcpConfiguration.inc:527
 msgid "DNS update zones"
 msgstr ""
 
@@ -364,6 +364,22 @@ msgstr "网络地址"
 msgid "Network address of this subnet"
 msgstr ""
 
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "DHCP Primary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:36
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:37
+msgid "Secondary DHCP server"
+msgstr ""
+
 #: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Permit list"
 msgstr ""
@@ -438,14 +454,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:217
+#: admin/systems/class_dhcpSystem.inc:216
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:231
+#: admin/systems/class_dhcpSystem.inc:230
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:235
+#: admin/systems/class_dhcpSystem.inc:234
 msgid "DHCP hosts declared for this system"
 msgstr ""
-- 
GitLab


From 8a621ca0fa8e3e2ca7fdfbd485001cf2facc26c7 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Sun, 13 Nov 2016 21:27:47 +0100
Subject: [PATCH 53/54] Fixes: #5232 we miss a dropdown for failover in the
 Create new DHCP section

Putting default values for primary and secondary in failover setup

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
index 54fe01fc77..b711f8f477 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
@@ -67,12 +67,13 @@ class dhcpFailOverPeer extends dhcpPlugin
           ),
           new IntAttribute (
             _('Split'), _('Split between the primary and secondary servers for fail over purpose'),
-            'dhcpFailOverSplit', FALSE,
-            0, FALSE
+            'dhcpFailOverSplit', TRUE,
+            0, FALSE, 128
           ),
           new StringAttribute (
             _('HashBucketAssignment'), _('HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074]'),
-            'dhcpHashBucketAssignment', FALSE
+            'dhcpHashBucketAssignment', TRUE,
+            "3600"
           ),
           new TimeAttribute (
             _('Load balance time'), _('Cutoff time in seconds, after which load balance is disabled'),
-- 
GitLab


From 25ab4c0fe9a57a657d3fb78f72754970e0cd9527 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Sun, 13 Nov 2016 21:51:58 +0100
Subject: [PATCH 54/54] Fixes: #5232 we miss a dropdown for failover in the
 Create new DHCP section

Putting default values for primary and secondary in failover setup

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
index b711f8f477..5268a4caa2 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
@@ -62,8 +62,8 @@ class dhcpFailOverPeer extends dhcpPlugin
           ),
           new TimeAttribute (
             _('Maximum Client Lead Time'), _('Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]'),
-            'dhcpMaxClientLeadTime', FALSE,
-            0, FALSE
+            'dhcpMaxClientLeadTime', TRUE,
+            0, FALSE, 3600
           ),
           new IntAttribute (
             _('Split'), _('Split between the primary and secondary servers for fail over purpose'),
@@ -72,8 +72,7 @@ class dhcpFailOverPeer extends dhcpPlugin
           ),
           new StringAttribute (
             _('HashBucketAssignment'), _('HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074]'),
-            'dhcpHashBucketAssignment', TRUE,
-            "3600"
+            'dhcpHashBucketAssignment', FALSE
           ),
           new TimeAttribute (
             _('Load balance time'), _('Cutoff time in seconds, after which load balance is disabled'),
-- 
GitLab